---

yaml --- r: 329781 b: refs/heads/master c: e423010 h: refs/heads/master i: 329779: 3abd79d v: v3
git-mirror · Sep 3, 2012 · c72ee50 · c72ee50
1 parent 614b053
commit c72ee50
Show file tree

Hide file tree

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