From c72ee50bd6309204d8b967de1c1d63ae4233e09f Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Mon, 27 Aug 2012 14:30:40 -0500
Subject: [PATCH] --- yaml --- r: 329781 b: refs/heads/master c:
 e4230108547766f4e105a62c45f3724309106f91 h: refs/heads/master i:   329779:
 3abd79d5fee8b0edd266945ce555e25dfcd5e23c v: v3

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

diff --git a/[refs] b/[refs]
index b8c5653271b4..78141ab4b61d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da02eb72f150bef1d281d93b3e4716ce374c4510
+refs/heads/master: e4230108547766f4e105a62c45f3724309106f91
diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c
index 8c892e93d8e7..d90ad0574705 100644
--- a/trunk/fs/ext3/super.c
+++ b/trunk/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;
 	}