Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 269bf7b8 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Greg Kroah-Hartman
Browse files

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: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b37d0c0

fs/ext4/super.c

+4 −2
Original line number Diff line number Diff line
@@ -825,6 +825,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);
@@ -834,9 +835,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");

	}
@@ -847,7 +849,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);

	}