diff --git a/[refs] b/[refs]
index 77bc3ebd8df4..6ee64e6a6d4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d1e463158febf6e047897597722f768b15350cd
+refs/heads/master: a95161aaa801c18c52b2e7cf3d6b4b141c00a20a
diff --git a/trunk/fs/nilfs2/super.c b/trunk/fs/nilfs2/super.c
index 5403b3ef3a42..8173faee31e6 100644
--- a/trunk/fs/nilfs2/super.c
+++ b/trunk/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;