diff options
Diffstat (limited to 'fs/dcache.c')
-rw-r--r-- | fs/dcache.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 40469044088d..3d4be6f8e49e 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -1650,9 +1650,8 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) | |||
1650 | 1650 | ||
1651 | if (inode && S_ISDIR(inode->i_mode)) { | 1651 | if (inode && S_ISDIR(inode->i_mode)) { |
1652 | spin_lock(&inode->i_lock); | 1652 | spin_lock(&inode->i_lock); |
1653 | new = __d_find_alias(inode, 1); | 1653 | new = __d_find_any_alias(inode); |
1654 | if (new) { | 1654 | if (new) { |
1655 | BUG_ON(!(new->d_flags & DCACHE_DISCONNECTED)); | ||
1656 | spin_unlock(&inode->i_lock); | 1655 | spin_unlock(&inode->i_lock); |
1657 | security_d_instantiate(new, inode); | 1656 | security_d_instantiate(new, inode); |
1658 | d_move(new, dentry); | 1657 | d_move(new, dentry); |