From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45942 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753395AbdCHPk7 (ORCPT ); Wed, 8 Mar 2017 10:40:59 -0500 Subject: Patch "ext4: preserve the needs_recovery flag when the journal is aborted" has been added to the 4.4-stable tree To: tytso@mit.edu, gregkh@linuxfoundation.org Cc: , From: Date: Wed, 08 Mar 2017 16:39:43 +0100 Message-ID: <14889875837484@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ext4: preserve the needs_recovery flag when the journal is aborted to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ext4-preserve-the-needs_recovery-flag-when-the-journal-is-aborted.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 97abd7d4b5d9c48ec15c425485f054e1c15e591b Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 4 Feb 2017 23:38:06 -0500 Subject: ext4: preserve the needs_recovery flag when the journal is aborted From: Theodore Ts'o 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 Signed-off-by: Greg Kroah-Hartman --- fs/ext4/super.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -793,6 +793,7 @@ static void ext4_put_super(struct super_ { 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); @@ -802,9 +803,10 @@ static void ext4_put_super(struct super_ 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"); } @@ -816,7 +818,7 @@ static void ext4_put_super(struct super_ ext4_ext_release(sb); ext4_xattr_put_super(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); } Patches currently in stable-queue which might be from tytso@mit.edu are queue-4.4/ext4-fix-data-corruption-in-data-journal-mode.patch queue-4.4/ext4-return-erofs-if-device-is-r-o-and-journal-replay-is-needed.patch queue-4.4/ext4-include-forgotten-start-block-on-fallocate-insert-range.patch queue-4.4/ext4-preserve-the-needs_recovery-flag-when-the-journal-is-aborted.patch queue-4.4/ext4-trim-allocation-requests-to-group-size.patch queue-4.4/ext4-do-not-polute-the-extents-cache-while-shifting-extents.patch queue-4.4/ext4-fix-inline-data-error-paths.patch queue-4.4/jbd2-don-t-leak-modified-metadata-buffers-on-an-aborted-journal.patch