diff --git a/[refs] b/[refs]
index ea38c590f910..2fa754bda2c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccfeb506231348a3c60ab0fdb5753a574653e3c0
+refs/heads/master: df1d5d23d3a1a713c69b0f9ec67c59aeca3ce6b3
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index bd269d268824..db29c7fa9620 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/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! */