---

yaml --- r: 201724 b: refs/heads/master c: f30b9c1 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · 84fd06a · 84fd06a
1 parent 7d4e3e2
commit 84fd06a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f841593ff65d2f801c7f80c4ed0955d30103f50
+refs/heads/master: f30b9c11847cb6bf1f7aa65b5c436800621a07dd
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
@@ -724,9 +724,14 @@ cifs_find_inode(struct inode *inode, void *opaque)
 {
 	struct cifs_fattr *fattr = (struct cifs_fattr *) opaque;
 
+	/* don't match inode with different uniqueid */
 	if (CIFS_I(inode)->uniqueid != fattr->cf_uniqueid)
 		return 0;
 
+	/* don't match inode of different type */
+	if ((inode->i_mode & S_IFMT) != (fattr->cf_mode & S_IFMT))
+		return 0;
+
 	/*
 	 * uh oh -- it's a directory. We can't use it since hardlinked dirs are
 	 * verboten. Disable serverino and return it as if it were found, the