From: Eric Sandeen <sandeen@redhat.com>
Date: Mon, 27 Aug 2012 19:30:40 +0000 (-0500)
Subject: ext3: don't clear orphan list on ro mount with errors
X-Git-Tag: firefly_0821_release~3680^2~1919^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e4230108547766f4e105a62c45f3724309106f91;p=firefly-linux-kernel-4.4.55.git

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

When we have a filesystem with an orphan inode list *and* in error
state, things behave differently if:

1) e2fsck -p is done prior to mount: e2fsck fixes things and exits
   happily (barring other significant problems)

vs.

2) mount is done first, then e2fsck -p: due to the orphan inode
   list removal, more errors are found and e2fsck exits with
   UNEXPECTED INCONSISTENCY.

The 2nd case above, on the root filesystem, has the tendency to halt
the boot process, which is unfortunate.

The situation can be improved by not clearing the orphan
inode list when the fs is mounted readonly.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 8c892e93d8e7..d90ad0574705 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1479,10 +1479,12 @@ static void ext3_orphan_cleanup (struct super_block * sb,
 	}
 
 	if (EXT3_SB(sb)->s_mount_state & EXT3_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;
 	}