From 75d5bf5686707e95fc21b2f336fbd3bc81fe6c37 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 21 Mar 2010 19:22:29 -0400
Subject: [PATCH] --- yaml --- r: 197936 b: refs/heads/master c:
 3981f2e2a04df4b95129ddbb8bb869ef1d57bea9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e19125448502..5bb9ea53f6b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ccde7c631f992bf79da8007b5fc8b6425eb0d6d
+refs/heads/master: 3981f2e2a04df4b95129ddbb8bb869ef1d57bea9
diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
index 110857ba9269..9307bbee6fbe 100644
--- a/trunk/fs/ceph/super.c
+++ b/trunk/fs/ceph/super.c
@@ -952,8 +952,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: