Commit 01b688c9 authored Nov 09, 2022 by Baokun Li Committed by Greg Kroah-Hartman Jan 18, 2023

ext4: correct inconsistent error msg in nojournal mode



[ Upstream commit 89481b5fa8c0640e62ba84c6020cee895f7ac643 ]

When we used the journal_async_commit mounting option in nojournal mode,
the kernel told me that "can't mount with journal_checksum", was very
confusing. I find that when we mount with journal_async_commit, both the
JOURNAL_ASYNC_COMMIT and EXPLICIT_JOURNAL_CHECKSUM flags are set. However,
in the error branch, CHECKSUM is checked before ASYNC_COMMIT. As a result,
the above inconsistency occurs, and the ASYNC_COMMIT branch becomes dead
code that cannot be executed. Therefore, we exchange the positions of the
two judgments to make the error msg more accurate.

Signed-off-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20221109074343.4184862-1-libaokun1@huawei.com


Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 1fede5e6

fs/ext4/super.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -4305,14 +4305,15 @@ static int ext4_fill_super(struct super_block sb, void data, int silent)
		goto failed_mount3a;
		} else {
		/* Nojournal mode, all journal mount options are illegal */
		if (test_opt2(sb, EXPLICIT_JOURNAL_CHECKSUM)) {
		if (test_opt(sb, JOURNAL_ASYNC_COMMIT)) {
		ext4_msg(sb, KERN_ERR, "can't mount with "
		"journal_checksum, fs mounted w/o journal");
		"journal_async_commit, fs mounted w/o journal");
		goto failed_mount3a;
		}
		if (test_opt(sb, JOURNAL_ASYNC_COMMIT)) {

		if (test_opt2(sb, EXPLICIT_JOURNAL_CHECKSUM)) {
		ext4_msg(sb, KERN_ERR, "can't mount with "
		"journal_async_commit, fs mounted w/o journal");
		"journal_checksum, fs mounted w/o journal");
		goto failed_mount3a;
		}
		if (sbi->s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ) {