libafs/LINUX: update file pos in corrupt dir fix

[openafs.git] / src / afs / LINUX / osi_vnodeops.c

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 25cbac2..6830b87 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -366,12 +366,20 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
 
        code = afs_dir_GetVerifiedBlob(tdc, dirpos, &entry);
        if (code) {
-           afs_warn("Corrupt directory (inode %lx, dirpos %d)",
-                    (unsigned long)&tdc->f.inode, dirpos);
-           ReleaseSharedLock(&avc->lock);
-           afs_PutDCache(tdc);
+           if (!(avc->f.states & CCorrupt)) {
+               struct cell *tc = afs_GetCellStale(avc->f.fid.Cell, READ_LOCK);
+               afs_warn("Corrupt directory (%d.%d.%d.%d [%s] @%lx, pos %d)",
+                        avc->f.fid.Cell, avc->f.fid.Fid.Volume,
+                        avc->f.fid.Fid.Vnode, avc->f.fid.Fid.Unique,
+                        tc ? tc->cellName : "",
+                        (unsigned long)&tdc->f.inode, dirpos);
+               if (tc)
+                   afs_PutCell(tc, READ_LOCK);
+               UpgradeSToWLock(&avc->lock, 814);
+               avc->f.states |= CCorrupt;
+           }
            code = -ENOENT;
-           goto out;
+           goto unlock_out;
         }
 
        de = (struct DirEntry *)entry.data;
@@ -433,12 +441,14 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
     /* If filldir didn't fill in the last one this is still pointing to that
      * last attempt.
      */
+    code = 0;
+
+unlock_out:
 #if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
     ctx->pos = (loff_t) offset;
 #else
     fp->f_pos = (loff_t) offset;
 #endif
-
     ReleaseReadLock(&tdc->lock);
     afs_PutDCache(tdc);
     UpgradeSToWLock(&avc->lock, 813);
@@ -446,7 +456,6 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
     avc->dcreaddir = 0;
     avc->readdir_pid = 0;
     ReleaseSharedLock(&avc->lock);
-    code = 0;
 
 out:
     afs_PutFakeStat(&fakestat);