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

LINUX: Propagate afs_linux_readdir BlobScan errors

Browse Source 
In afs_linux_readdir, if we detect an error code from BlobScan,
currently we 'break' out of the current while() loop. But right after
this loop, we reset 'code' to 0, ignoring the error we just got from
BlobScan, and acting like we just reached the end of the directory.

This means that if BlobScan could not process the given directory at
all, we'll just fail to iterate through some of the entries in the
given directory, and not report an error.

To fix this, process errors from BlobScan like we do for
afs_dir_GetVerifiedBlob, and return an error code and log a message
about the corrupted dir.

Change-Id: I8bd628624ffc04fc55fd6a0820c73018bd9e4a18
Reviewed-on: https://gerrit.openafs.org/13430
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Andrew Deason 2019-01-16 23:44:58 -06:00 committed by Benjamin Kaduk
parent 2e556c0f23
commit 63f015d052
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/afs/LINUX/osi_vnodeops.c
View File

@ -401,11 +401,17 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
offset = (int) fp->f_pos; offset = (int) fp->f_pos;
#endif #endif
while (1) { while (1) {
dirpos = 0;
code = BlobScan(tdc, offset, &dirpos); code = BlobScan(tdc, offset, &dirpos);
if (code || !dirpos) if (code == 0 && dirpos == 0) {
break; /* We've reached EOF of the dir blob, so we can stop looking for
* entries. */
break;
}
code = afs_dir_GetVerifiedBlob(tdc, dirpos, &entry); if (code == 0) {
code = afs_dir_GetVerifiedBlob(tdc, dirpos, &entry);
}
if (code) { if (code) {
if (!(avc->f.states & CCorrupt)) { if (!(avc->f.states & CCorrupt)) {
struct cell *tc = afs_GetCellStale(avc->f.fid.Cell, READ_LOCK); struct cell *tc = afs_GetCellStale(avc->f.fid.Cell, READ_LOCK);