From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 8 Aug 2009 20:52:02 +0000 (+0400)
Subject: switch nilfs2 to deactivate_locked_super()
X-Git-Tag: v2.6.33-rc1~49^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a95161aaa801c18c52b2e7cf3d6b4b141c00a20a;p=thirdparty%2Fkernel%2Flinux.git

switch nilfs2 to deactivate_locked_super()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 5403b3ef3a42b..8173faee31e64 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -1118,8 +1118,7 @@ nilfs_get_sb(struct file_system_type *fs_type, int flags,
 	/* Abandoning the newly allocated superblock */
 	mutex_unlock(&nilfs->ns_mount_mutex);
 	put_nilfs(nilfs);
-	up_write(&s->s_umount);
-	deactivate_super(s);
+	deactivate_locked_super(s);
 	/*
 	 * deactivate_super() invokes close_bdev_exclusive().
 	 * We must finish all post-cleaning before this call;