summaryrefslogtreecommitdiffstats
path: root/fs/ceph/super.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-11-01 07:47:40 +0100
committerIngo Molnar <mingo@kernel.org>2016-11-01 07:47:40 +0100
commitc29c716662d0cefc0cda4903aea5ed6794174679 (patch)
tree01d4dc47933e1bcbeca8d53b0cf5c1f70da04535 /fs/ceph/super.c
parente63650840e8b053aa09ad934877e87e9941ed135 (diff)
parent405c0759712f57b680f66aee9c55cd06ad1cbdef (diff)
downloadlinux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.bz2
Merge branch 'core/urgent' into x86/fpu, to merge fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ceph/super.c')
-rw-r--r--fs/ceph/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index a29ffce98187..b382e5910eea 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -845,6 +845,8 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc)
err = ceph_fs_debugfs_init(fsc);
if (err < 0)
goto fail;
+ } else {
+ root = dget(fsc->sb->s_root);
}
fsc->mount_state = CEPH_MOUNT_MOUNTED;