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

Commit 6504fdbf authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

ext4: reject the 'commit' option on ext2 filesystems 



[ Upstream commit cb8435dc8ba33bcafa41cf2aa253794320a3b8df ]

The 'commit' option is only applicable for ext3 and ext4 filesystems,
and has never been accepted by the ext2 filesystem driver, so the ext4
driver shouldn't allow it on ext2 filesystems.

This fixes a failure in xfstest ext4/053.

Fixes: 8dc0aa8c ("ext4: check incompatible mount options while mounting ext2/3")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarRitesh Harjani <ritesh.list@gmail.com>
Reviewed-by: default avatarLukas Czerner <lczerner@redhat.com>
Link: https://lore.kernel.org/r/20220510183232.172615-1-ebiggers@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5dbd7937

fs/ext4/super.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1688,6 +1688,7 @@ static const struct mount_opts { 
	 MOPT_EXT4_ONLY | MOPT_CLEAR},

	 MOPT_EXT4_ONLY | MOPT_CLEAR},

	{Opt_warn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_SET},

	{Opt_warn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_SET},

	{Opt_nowarn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_CLEAR},

	{Opt_nowarn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_CLEAR},

	{Opt_commit, 0, MOPT_NO_EXT2},

	{Opt_nojournal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,

	{Opt_nojournal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,

	 MOPT_EXT4_ONLY | MOPT_CLEAR},

	 MOPT_EXT4_ONLY | MOPT_CLEAR},

	{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,

	{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,