From 841183420a16c6259f3cd610e129d5d596e5ce93 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 6 Jun 2008 17:59:59 -0400 Subject: [PATCH] Update jbd2 journal checksum error patch so it sets the error flag. --- jbd2-if-a-journal-checksum-error-is-detected-propa.patch | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jbd2-if-a-journal-checksum-error-is-detected-propa.patch b/jbd2-if-a-journal-checksum-error-is-detected-propa.patch index 6d8dadfb..07f090ef 100644 --- a/jbd2-if-a-journal-checksum-error-is-detected-propa.patch +++ b/jbd2-if-a-journal-checksum-error-is-detected-propa.patch @@ -10,10 +10,10 @@ corruption being detected. Signed-off-by: "Theodore Ts'o" diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 09d9359..cbcc9df 100644 +index 09d9359..d01a32e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -2189,6 +2189,24 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) +@@ -2189,6 +2189,29 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_HAS_JOURNAL)) { if (ext4_load_journal(sb, es, journal_devnum)) goto failed_mount3; @@ -27,12 +27,17 @@ index 09d9359..cbcc9df 100644 + printk (KERN_CRIT + "Mounting filesystem read-only\n"); + sb->s_flags |= MS_RDONLY; ++ EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; ++ es->s_state |= cpu_to_le16(EXT4_ERROR_FS); + } + if (test_opt(sb, ERRORS_PANIC)) { ++ EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; ++ es->s_state |= cpu_to_le16(EXT4_ERROR_FS); ++ ext4_commit_super(sb, es, 1); + printk(KERN_CRIT + "EXT4-fs (device %s): mount failed\n", + sb->s_id); -+ goto failed_mount3; ++ goto failed_mount4; + } + } } else if (journal_inum) { -- 2.11.4.GIT