Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[karo-tx-linux.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 18cdcd1dbe11712e009293beb20eeebbe231701d..c4124de4435bffed06afc3a76ea6aba49a7c5317 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -851,7 +851,6 @@ static struct dentry *get_default_root(struct super_block *sb,
        struct btrfs_path *path;
        struct btrfs_key location;
        struct inode *inode;
-       struct dentry *dentry;
        u64 dir_id;
        int new = 0;
 
@@ -922,13 +921,7 @@ setup_root:
                return dget(sb->s_root);
        }
 
-       dentry = d_obtain_alias(inode);
-       if (!IS_ERR(dentry)) {
-               spin_lock(&dentry->d_lock);
-               dentry->d_flags &= ~DCACHE_DISCONNECTED;
-               spin_unlock(&dentry->d_lock);
-       }
-       return dentry;
+       return d_obtain_root(inode);
 }
 
 static int btrfs_fill_super(struct super_block *sb,