From 68e163ce54d451a038a545862f7c0bb5e4b0e237 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 5 May 2009 23:48:50 -0400
Subject: [PATCH] --- yaml --- r: 147845 b: refs/heads/master c:
 443b94baaa16771e98b29ca7c24f1e305738ffca h: refs/heads/master i:   147843:
 84a346c538f60a85297c8d652c82c5c59e5c89c5 v: v3

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

diff --git a/[refs] b/[refs]
index 0664bbcb084f..f665694bd71b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5af7926ff33b68b3ba46531471c6e0564b285efc
+refs/heads/master: 443b94baaa16771e98b29ca7c24f1e305738ffca
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
index cb19fffc7681..49f670cb9a83 100644
--- a/trunk/fs/super.c
+++ b/trunk/fs/super.c
@@ -579,7 +579,7 @@ static void do_emergency_remount(struct work_struct *work)
 	list_for_each_entry(sb, &super_blocks, s_list) {
 		sb->s_count++;
 		spin_unlock(&sb_lock);
-		down_read(&sb->s_umount);
+		down_write(&sb->s_umount);
 		if (sb->s_root && sb->s_bdev && !(sb->s_flags & MS_RDONLY)) {
 			/*
 			 * ->remount_fs needs lock_kernel().
@@ -590,7 +590,8 @@ static void do_emergency_remount(struct work_struct *work)
 			do_remount_sb(sb, MS_RDONLY, NULL, 1);
 			unlock_kernel();
 		}
-		drop_super(sb);
+		up_write(&sb->s_umount);
+		put_super(sb);
 		spin_lock(&sb_lock);
 	}
 	spin_unlock(&sb_lock);