From e2eb2402d9284e05317d36619304d6a2f4ad5fb6 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Wed, 9 May 2012 17:18:05 -0400
Subject: [PATCH] --- yaml --- r: 310027 b: refs/heads/master c:
 7732a557b1342c6e6966efb5f07effcf99f56167 h: refs/heads/master i:   310025:
 d560bf8ca9addebd3ce91e56ed49a1b12e61ea24   310023:
 16413af77fe929a59bc4f3eca0e337fac19a1ebf v: v3

---
 [refs]            | 2 +-
 trunk/fs/dcache.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b0defa52be93..b6a24f42da08 100644
--- 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
index 40469044088d..3d4be6f8e49e 100644
--- 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);