aboutsummaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-01-15 13:56:29 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-02-03 15:35:04 -0800
commitdf1d5d23d3a1a713c69b0f9ec67c59aeca3ce6b3 (patch)
tree2d5c3d7ba82c3f7010089414db2f0563ff6bd3e0 /fs/nfs
parentccfeb506231348a3c60ab0fdb5753a574653e3c0 (diff)
NFS: Fix a readdir/lookup inefficiency.
Make sure that nfs_readdir_lookup() handles negative dentries correctly. If d_lookup() returns a negative dentry, then we need to d_drop() that since readdir shows that it should be positive. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/dir.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index bd269d26882..db29c7fa962 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1123,8 +1123,14 @@ static struct dentry *nfs_readdir_lookup(nfs_readdir_descriptor_t *desc)
}
name.hash = full_name_hash(name.name, name.len);
dentry = d_lookup(parent, &name);
- if (dentry != NULL)
- return dentry;
+ if (dentry != NULL) {
+ /* Is this a positive dentry? */
+ if (dentry->d_inode != NULL)
+ return dentry;
+ /* No, so d_drop to allow one to be created */
+ d_drop(dentry);
+ dput(dentry);
+ }
if (!desc->plus || !(entry->fattr->valid & NFS_ATTR_FATTR))
return NULL;
/* Note: caller is already holding the dir->i_mutex! */