jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STABLE14-viced-assert-less-20070719

Browse Source 
in don't assert for every silly thing


(cherry picked from commit 58d6f0b42ad552972e03c75d61d90a0398adf0cc)
This commit is contained in:
Derrick Brashear 2007-07-19 16:17:22 +00:00
parent 8478a18334
commit 15d053fb10
1 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/viced/afsfileprocs.c
View File

@ -1137,7 +1137,13 @@ CopyOnWrite(Vnode * targetptr, Volume * volptr)
}
ino = VN_GET_INO(targetptr);
assert(VALID_INO(ino));
if (!VALID_INO(ino)) {
free(buff);
VTakeOffline(volptr);
ViceLog(0, ("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
targFdP = IH_OPEN(targetptr->handle);
if (targFdP == NULL) {
rc = errno;
@ -1300,6 +1306,9 @@ DeleteTarget(Vnode * parentptr, Volume * volptr, Vnode ** targetptr,
*/
if ((*targetptr)->disk.uniquifier != fileFid->Unique) {
VTakeOffline(volptr);
ViceLog(0,
("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
errorCode = VSALVAGE;
return errorCode;
}
@ -1327,10 +1336,10 @@ DeleteTarget(Vnode * parentptr, Volume * volptr, Vnode ** targetptr,
errno));
if (errno != ENOENT)
{
VTakeOffline(volptr);
ViceLog(0,
("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
VTakeOffline(volptr);
return (EIO);
}
DT1++;
@ -1353,10 +1362,10 @@ DeleteTarget(Vnode * parentptr, Volume * volptr, Vnode ** targetptr,
("Error %d deleting %s\n", code,
(((*targetptr)->disk.type ==
Directory) ? "directory" : "file")));
VTakeOffline(volptr);
ViceLog(0,
("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
VTakeOffline(volptr);
if (!errorCode)
errorCode = code;
}
@ -4107,6 +4116,9 @@ SAFSS_Rename(struct rx_call *acall, struct AFSFid *OldDirFid, char *OldName,
VPutVnode(&errorCode, testvptr);
if ((top == 1) && (testnode != 0)) {
VTakeOffline(volptr);
ViceLog(0,
("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
errorCode = EIO;
goto Bad_Rename;
}
@ -4436,10 +4448,18 @@ SAFSS_Symlink(struct rx_call *acall, struct AFSFid *DirFid, char *Name,
/* Write the contents of the symbolic link name into the target inode */
fdP = IH_OPEN(targetptr->handle);
assert(fdP != NULL);
if (fdP == NULL) {
(void)PutVolumePackage(parentwhentargetnotdir, targetptr, parentptr,
volptr, &client);
VTakeOffline(volptr);
ViceLog(0, ("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
len = strlen((char *) LinkContents);
code = (len == FDH_WRITE(fdP, (char *) LinkContents, len)) ? 0 : VDISKFULL;
if (code) ViceLog(0, ("SAFSS_Symlink FDH_WRITE failed for len=%d, Fid=%u.%d.%d\n", len, OutFid->Volume, OutFid->Vnode, OutFid->Unique));
code = (len == FDH_WRITE(fdP, (char *) LinkContents, len)) ? 0 : VDISKFULL;
if (code)
ViceLog(0, ("SAFSS_Symlink FDH_WRITE failed for len=%d, Fid=%u.%d.%d\n", len, OutFid->Volume, OutFid->Vnode, OutFid->Unique));
FDH_CLOSE(fdP);
/*
* Set up and return modified status for the parent dir and new symlink
@ -6922,6 +6942,8 @@ FetchData_RXStyle(Volume * volptr, Vnode * targetptr,
fdP = IH_OPEN(ihP);
if (fdP == NULL) {
VTakeOffline(volptr);
ViceLog(0, ("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
optSize = sendBufSize;
@ -6931,6 +6953,8 @@ FetchData_RXStyle(Volume * volptr, Vnode * targetptr,
if (tlen < 0) {
FDH_CLOSE(fdP);
VTakeOffline(volptr);
ViceLog(0, ("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
if (Pos > tlen) {
@ -6969,6 +6993,8 @@ FetchData_RXStyle(Volume * volptr, Vnode * targetptr,
FDH_CLOSE(fdP);
FreeSendBuffer((struct afs_buffer *)tbuffer);
VTakeOffline(volptr);
ViceLog(0, ("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
errorCode = rx_Write(Call, tbuffer, wlen);
@ -6983,6 +7009,8 @@ FetchData_RXStyle(Volume * volptr, Vnode * targetptr,
if (errorCode != wlen) {
FDH_CLOSE(fdP);
VTakeOffline(volptr);
ViceLog(0, ("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
errorCode = rx_Writev(Call, tiov, tnio, wlen);
@ -7155,6 +7183,8 @@ StoreData_RXStyle(Volume * volptr, Vnode * targetptr, struct AFSFid * Fid,
if (GetLinkCountAndSize(volptr, fdP, &linkCount, &DataLength) < 0) {
FDH_CLOSE(fdP);
VTakeOffline(volptr);
ViceLog(0, ("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
@ -7198,7 +7228,12 @@ StoreData_RXStyle(Volume * volptr, Vnode * targetptr, struct AFSFid * Fid,
}
tinode = VN_GET_INO(targetptr);
}
assert(VALID_INO(tinode));
if (!VALID_INO(tinode)) {
VTakeOffline(volptr);
ViceLog(0,("Volume %u now offline, must be salvaged.\n",
volptr->hashid));
return EIO;
}
/* compute new file length */
NewLength = DataLength;