diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-01-15 13:56:29 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-03 15:35:04 -0800 |
| commit | df1d5d23d3a1a713c69b0f9ec67c59aeca3ce6b3 (patch) | |
| tree | 2d5c3d7ba82c3f7010089414db2f0563ff6bd3e0 /fs/nfs/dir.c | |
| parent | ccfeb506231348a3c60ab0fdb5753a574653e3c0 (diff) | |
| download | op-kernel-dev-df1d5d23d3a1a713c69b0f9ec67c59aeca3ce6b3.zip op-kernel-dev-df1d5d23d3a1a713c69b0f9ec67c59aeca3ce6b3.tar.gz | |
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/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index bd269d2..db29c7f 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! */ |
