linux-dentry-revalidation-always-revalidate-20010420

[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 6e5ecd7..5958e65 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -675,57 +675,14 @@ static int afs_linux_revalidate(struct dentry *dp)
     return -code ;
 }
 
-/* Validate a dentry. Return 0 if unchanged, 1 if VFS layer should re-evaluate.
- * In kernels 2.2.10 and above, we are passed an additional flags var which
- * may have either the LOOKUP_FOLLOW OR LOOKUP_DIRECTORY set in which case
- * we are advised to follow the entry if it is a link or to make sure that 
- * it is a directory. But since the kernel itself checks these possibilities
- * later on, we shouldn't have to do it until later. Perhaps in the future..
- */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
 static int afs_linux_dentry_revalidate(struct dentry *dp, int flags)
 #else
 static int afs_linux_dentry_revalidate(struct dentry *dp)
 #endif
 {
-    int code;
-    cred_t *credp;
-    struct vrequest treq;
-    struct vcache *vcp = (struct vcache*)dp->d_inode;
-
-    /* If it's a negative dentry, then there's nothing to do. */
-    if (!vcp) {
-       goto out_valid;
-    }
-
-    AFS_GLOCK();
-#ifdef AFS_LINUX24_ENV
-    lock_kernel();
-#endif
-
-    /* Drop the dentry if the callback is broken */
-    if (!(vcp->states & CStatd)) {
-        d_drop(dp);
-#ifdef AFS_LINUX24_ENV
-        unlock_kernel();
-#endif
-       AFS_GUNLOCK();
-        return 0;
-    }
-
-    /* Make this a fast path (no crref), since it's called so often. */
-    if (*dp->d_name.name != '/' && vcp->mvstat == 2) /* root vnode */
-       check_bad_parent(dp); /* check and correct mvid */
-    vcache2inode(vcp);
-#ifdef AFS_LINUX24_ENV
-    unlock_kernel();
-#endif
-    AFS_GUNLOCK();
-
-out_valid:
-    return 1;
-
-out_bad:
+    /* Force revalidation as this may be a different client than the
+       one which caused an entry to get cached */
     return 0;
 }
 
@@ -806,6 +763,9 @@ int afs_linux_create(struct inode *dip, struct dentry *dp, int mode)
 #endif
 
        dp->d_op = afs_dops;
+        /* This DV is probably wrong, unfortunately, Perhaps we should 
+           VerifyVCache the directory  */
+        dp->d_time=hgetlo(((struct vcache *)dip)->m.DataVersion);
        d_instantiate(dp, ip);
     }
 
@@ -852,6 +812,8 @@ int afs_linux_lookup(struct inode *dip, struct dentry *dp)
            ip->i_op = &afs_symlink_iops;
 #endif
     }
+    /* directory ought to be stat'd here.... */
+    dp->d_time=hgetlo(((struct vcache *)dip)->m.DataVersion);
     dp->d_op = afs_dops;
     d_add(dp, (struct inode*)vcp);
 
@@ -917,9 +879,13 @@ int afs_linux_unlink(struct inode *dip, struct dentry *dp)
     AFS_GUNLOCK();
     if (!code) {
        d_delete(dp);
-       if (putback)
+       if (putback) {
+           /* This DV is probably wrong, unfortunately, Perhaps we should 
+              VerifyVCache the directory  */
+            dp->d_time=hgetlo(((struct vcache *)dip)->m.DataVersion);
            d_add(dp, NULL); /* means definitely does _not_ exist */
     }
+    }
     crfree(credp);
     return -code;
 }
@@ -966,6 +932,9 @@ int afs_linux_mkdir(struct inode *dip, struct dentry *dp, int mode)
        tvcp->v.v_fop = &afs_dir_fops;
 #endif
        dp->d_op = afs_dops;
+        /* This DV is probably wrong, unfortunately, Perhaps we should 
+           VerifyVCache the directory  */
+        dp->d_time=hgetlo(((struct vcache *)dip)->m.DataVersion);
        d_instantiate(dp, (struct inode*)tvcp);
     }
     AFS_GUNLOCK();
@@ -1025,8 +994,13 @@ int afs_linux_rename(struct inode *oldip, struct dentry *olddp,
                      newname, credp);
     AFS_GUNLOCK();
 
-    if (!code)
+    if (!code) {
+        /* update time so it doesn't expire immediately */
+        /* This DV is probably wrong, unfortunately, Perhaps we should 
+           VerifyVCache the directory  */
+        newdp->d_time=hgetlo(((struct vcache *)newdp->d_parent->d_inode)->m.DataVersion);
        d_move(olddp, newdp);
+    }
 
     crfree(credp);
     return -code;