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

Commit 63894ab9 authored by Eryu Guan's avatar Eryu Guan Committed by Jan Kara
Browse files

ext3: call ext3_mark_recovery_complete() when recovery is really needed 



Call ext3_mark_recovery_complete() in ext3_fill_super() only if
needs_recovery is non-zero.

Besides that, print out "recovery complete" message after calling
ext3_mark_recovery_complete().

Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarEryu Guan <guaneryu@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 19e0bafc

fs/ext3/super.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -2060,9 +2060,10 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;

	EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;

	ext3_orphan_cleanup(sb, es);

	ext3_orphan_cleanup(sb, es);

	EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS;

	EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS;

	if (needs_recovery)

	if (needs_recovery) {

		ext3_msg(sb, KERN_INFO, "recovery complete");

		ext3_mark_recovery_complete(sb, es);

		ext3_mark_recovery_complete(sb, es);

		ext3_msg(sb, KERN_INFO, "recovery complete");

	}

	ext3_msg(sb, KERN_INFO, "mounted filesystem with %s data mode",

	ext3_msg(sb, KERN_INFO, "mounted filesystem with %s data mode",

		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA ? "journal":

		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA ? "journal":

		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":

		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":