| From d28d56b8e43852a098587fd3d5229df8c9ced004 Mon Sep 17 00:00:00 2001 |
| From: Theodore Ts'o <tytso@mit.edu> |
| Date: Sat, 4 Feb 2017 23:38:06 -0500 |
| Subject: [PATCH] ext4: preserve the needs_recovery flag when the journal is |
| aborted |
| |
| commit 97abd7d4b5d9c48ec15c425485f054e1c15e591b upstream. |
| |
| If the journal is aborted, the needs_recovery feature flag should not |
| be removed. Otherwise, it's the journal might not get replayed and |
| this could lead to more data getting lost. |
| |
| Signed-off-by: Theodore Ts'o <tytso@mit.edu> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/ext4/super.c b/fs/ext4/super.c |
| index cd0d926fad09..8b8fde826fb8 100644 |
| --- a/fs/ext4/super.c |
| +++ b/fs/ext4/super.c |
| @@ -822,6 +822,7 @@ static void ext4_put_super(struct super_block *sb) |
| { |
| struct ext4_sb_info *sbi = EXT4_SB(sb); |
| struct ext4_super_block *es = sbi->s_es; |
| + int aborted = 0; |
| int i, err; |
| |
| ext4_unregister_li_request(sb); |
| @@ -831,9 +832,10 @@ static void ext4_put_super(struct super_block *sb) |
| destroy_workqueue(sbi->rsv_conversion_wq); |
| |
| if (sbi->s_journal) { |
| + aborted = is_journal_aborted(sbi->s_journal); |
| err = jbd2_journal_destroy(sbi->s_journal); |
| sbi->s_journal = NULL; |
| - if (err < 0) |
| + if ((err < 0) && !aborted) |
| ext4_abort(sb, "Couldn't clean up the journal"); |
| } |
| |
| @@ -844,7 +846,7 @@ static void ext4_put_super(struct super_block *sb) |
| ext4_mb_release(sb); |
| ext4_ext_release(sb); |
| |
| - if (!(sb->s_flags & MS_RDONLY)) { |
| + if (!(sb->s_flags & MS_RDONLY) && !aborted) { |
| ext4_clear_feature_journal_needs_recovery(sb); |
| es->s_state = cpu_to_le16(sbi->s_mount_state); |
| } |
| -- |
| 2.12.0 |
| |
