From 1faedc6387d9a5ddef532f4c60cb0ab60a761f01 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Fri, 28 Oct 2011 14:13:20 +0200
Subject: [PATCH] --- yaml --- r: 273191 b: refs/heads/master c:
 2833eb2b465a274d1a2529fed76c6d2904f8022b h: refs/heads/master i:   273189:
 ad48d3fb785dd38179a6cba4f155e106132f38e5   273187:
 27fbb58e4110ef52e1499a9abc2d5c3a86038c39   273183:
 c86ba5b9ced959ae0e9aba278d9e6ac73ed85ff0 v: v3

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

diff --git a/[refs] b/[refs]
index df49f22308ec..4afeafce9b79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fa1e7f615f4d3ae436fa319af6e4eebdd4026a8
+refs/heads/master: 2833eb2b465a274d1a2529fed76c6d2904f8022b
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
index 32a81f3467e0..afd0f1ad45e0 100644
--- a/trunk/fs/super.c
+++ b/trunk/fs/super.c
@@ -727,8 +727,13 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
 
 	if (sb->s_op->remount_fs) {
 		retval = sb->s_op->remount_fs(sb, &flags, data);
-		if (retval)
-			return retval;
+		if (retval) {
+			if (!force)
+				return retval;
+			/* If forced remount, go ahead despite any errors */
+			WARN(1, "forced remount of a %s fs returned %i\n",
+			     sb->s_type->name, retval);
+		}
 	}
 	sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);