Fix a problem whereby READDIRPLUS was causing lookups to result in

ESTALE errors.

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index fd894fa6584bc6c7059bf7ed79c2320aeb7ec169..dab0b0bd0ef35989f49b6fb5b7e363028c7f95f4 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -557,7 +557,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
        /* Force a full look up iff the parent directory has changed */
        if (nfs_check_verifier(dir, dentry)) {
                if (nfs_lookup_verify_inode(inode, isopen))
-                       goto out_bad;
+                       goto out_zap_parent;
                goto out_valid;
        }
 
@@ -566,7 +566,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
                if (memcmp(NFS_FH(inode), &fhandle, sizeof(struct nfs_fh))!= 0)
                        goto out_bad;
                if (nfs_lookup_verify_inode(inode, isopen))
-                       goto out_bad;
+                       goto out_zap_parent;
                goto out_valid_renew;
        }
 
@@ -587,6 +587,8 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
        unlock_kernel();
        dput(parent);
        return 1;
+out_zap_parent:
+       nfs_zap_caches(dir);
  out_bad:
        NFS_CACHEINV(dir);
        if (inode && S_ISDIR(inode->i_mode)) {