From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 27 Sep 2012 03:30:12 +0000 (-0400)
Subject: ext4: don't clear orphan list on ro mount with errors
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c25f9bc6143f4cb4dc31d2ad7a6fe4e4005fc414;p=linux-beck.git

ext4: don't clear orphan list on ro mount with errors

If the file system contains errors and it is being mounted read-only,
don't clear the orphan list.  We should minimize changes to the file
system if it is mounted read-only.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 7bef0a4bc518..a53a23aef5e3 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2177,10 +2177,12 @@ static void ext4_orphan_cleanup(struct super_block *sb,
 	}
 
 	if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) {
-		if (es->s_last_orphan)
+		/* don't clear list on RO mount w/ errors */
+		if (es->s_last_orphan && !(s_flags & MS_RDONLY)) {
 			jbd_debug(1, "Errors on filesystem, "
 				  "clearing orphan list.\n");
-		es->s_last_orphan = 0;
+			es->s_last_orphan = 0;
+		}
 		jbd_debug(1, "Skipping orphan recovery on fs with errors.\n");
 		return;
 	}