---

yaml --- r: 310027 b: refs/heads/master c: 7732a55 h: refs/heads/master i: 310025: d560bf8 310023: 16413af v: v3
git-mirror · May 31, 2012 · e2eb240 · e2eb240
1 parent b85d6ce
commit e2eb240
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 244ca2b4d0b5e500681e52ad9e6d7f3f2b9362a1
+refs/heads/master: 7732a557b1342c6e6966efb5f07effcf99f56167
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
@@ -1650,9 +1650,8 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
 
 	if (inode && S_ISDIR(inode->i_mode)) {
 		spin_lock(&inode->i_lock);
-		new = __d_find_alias(inode, 1);
+		new = __d_find_any_alias(inode);
 		if (new) {
-			BUG_ON(!(new->d_flags & DCACHE_DISCONNECTED));
 			spin_unlock(&inode->i_lock);
 			security_d_instantiate(new, inode);
 			d_move(new, dentry);