Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df1d5d23 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ccfeb506

fs/nfs/dir.c

+8 −2
Original line number Diff line number Diff line
@@ -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)

	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! */