---

yaml --- r: 336175 b: refs/heads/master c: 0903a0c h: refs/heads/master i: 336173: b3538e9 336171: 8644bd0 336167: 260bf4a 336159: f8d92d6 v: v3
git-mirror · Nov 30, 2012 · d9b5b21 · d9b5b21
1 parent 4a374d5
commit d9b5b21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c44600c9d1de64314c2bd58103f15acb53e10073
+refs/heads/master: 0903a0c8491c1e987dfc6eb294199a36760398bc
diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c
@@ -86,14 +86,17 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name,
 
 	dentry = d_lookup(parent, name);
 	if (dentry) {
+		int err;
 		inode = dentry->d_inode;
 		/* update inode in place if i_ino didn't change */
 		if (inode && CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
 			cifs_fattr_to_inode(inode, fattr);
 			return dentry;
 		}
-		d_drop(dentry);
+		err = d_invalidate(dentry);
 		dput(dentry);
+		if (err)
+			return NULL;
 	}
 
 	dentry = d_alloc(parent, name);