---

yaml --- r: 312054 b: refs/heads/master c: cd60042 h: refs/heads/master v: v3
git-mirror · Jul 17, 2012 · 9da6116 · 9da6116
1 parent 8d18398
commit 9da6116
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cf003c08be785af4bee9ac05891a15bcbff856a
+refs/heads/master: cd60042cc1392e79410dc8de9e9c1abb38a29e57
diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c
@@ -86,9 +86,12 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name,
 
 	dentry = d_lookup(parent, name);
 	if (dentry) {
-		/* FIXME: check for inode number changes? */
-		if (dentry->d_inode != NULL)
+		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);
 		dput(dentry);
 	}