summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2022-05-10 11:32:32 -0700
committerTheodore Ts'o <tytso@mit.edu>2022-05-18 11:24:22 -0400
commitcb8435dc8ba33bcafa41cf2aa253794320a3b8df (patch)
tree13636c9efca665671e87d787ae0078a5910a7a27 /fs
parentb10b6278ae17366fec058219623c757b3302baae (diff)
downloadlinux-stable-cb8435dc8ba33bcafa41cf2aa253794320a3b8df.tar.gz
linux-stable-cb8435dc8ba33bcafa41cf2aa253794320a3b8df.tar.bz2
linux-stable-cb8435dc8ba33bcafa41cf2aa253794320a3b8df.zip
ext4: reject the 'commit' option on ext2 filesystems
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: 8dc0aa8cf0f7 ("ext4: check incompatible mount options while mounting ext2/3") Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Ritesh Harjani <ritesh.list@gmail.com> Reviewed-by: Lukas Czerner <lczerner@redhat.com> Link: https://lore.kernel.org/r/20220510183232.172615-1-ebiggers@kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4b0ea8df1f5c..3f59efd3aa3e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1915,6 +1915,7 @@ static const struct mount_opts {
MOPT_EXT4_ONLY | MOPT_CLEAR},
{Opt_warn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_SET},
{Opt_nowarn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_CLEAR},
+ {Opt_commit, 0, MOPT_NO_EXT2},
{Opt_nojournal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,
MOPT_EXT4_ONLY | MOPT_CLEAR},
{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,