Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[safe/jmp/linux-2.6] / fs / ceph / super.c

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 5cf6fba..4e0bee2 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -997,8 +997,7 @@ static int ceph_get_sb(struct file_system_type *fs_type,
 
 out_splat:
        ceph_mdsc_close_sessions(&client->mdsc);
-       up_write(&sb->s_umount);
-       deactivate_super(sb);
+       deactivate_locked_super(sb);
        goto out_final;
 
 out: