Commit ada3fb86 authored by Zhihao Cheng's avatar Zhihao Cheng Committed by Theodore Ts'o
Browse files

ext4: move ext4_check_bdev_write_error() into nojournal mode 



Since JBD2 takes care of all metadata writeback errors of fs dev,
ext4_check_bdev_write_error() is useful only in nojournal mode.
Move it into '!ext4_handle_valid(handle)' branch.

Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Suggested-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20231213013224.2100050-6-chengzhihao1@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent b4e73e61

fs/ext4/ext4_jbd2.c

+2 −3
Original line number Diff line number Diff line
@@ -235,8 +235,6 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line, 


	might_sleep();



	ext4_check_bdev_write_error(sb);



	if (ext4_handle_valid(handle)) {

		err = jbd2_journal_get_write_access(handle, bh);

		if (err) {
@@ -244,7 +242,8 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line, 
						  handle, err);

			return err;

		}

	}

	} else

		ext4_check_bdev_write_error(sb);

	if (trigger_type == EXT4_JTR_NONE || !ext4_has_metadata_csum(sb))

		return 0;

	BUG_ON(trigger_type >= EXT4_JOURNAL_TRIGGER_COUNT);