---

yaml --- r: 273191 b: refs/heads/master c: 2833eb2 h: refs/heads/master i: 273189: ad48d3f 273187: 27fbb58 273183: c86ba5b v: v3
git-mirror · Nov 2, 2011 · 1faedc6 · 1faedc6
1 parent 0e5cfc4
commit 1faedc6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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);