X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fsuper.c;h=afd0f1ad45e052068499f7cc94699bef6fbc4084;hb=73104b6e37f75f822e3dcf016147c322d1f6dad9;hp=32a81f3467e06835abdf8e5a3beb91acc3a2c161;hpb=f906fb1d70e016726fccfb0d978c5d425503db9d;p=karo-tx-linux.git

diff --git a/fs/super.c b/fs/super.c
index 32a81f3467e0..afd0f1ad45e0 100644
--- a/fs/super.c
+++ b/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);