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

Commit 5ba92bcf authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Theodore Ts'o
Browse files

ext4: reject journal options for ext2 mounts 



There is no reason to allow ext2 filesystems be mounted with journal
mount options. So, this patch adds them to the MOPT_NO_EXT2 mount
options list.

Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 001e4a87

fs/ext4/super.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1394,9 +1394,9 @@ static const struct mount_opts { 
	{Opt_stripe, 0, MOPT_GTE0},

	{Opt_stripe, 0, MOPT_GTE0},

	{Opt_resuid, 0, MOPT_GTE0},

	{Opt_resuid, 0, MOPT_GTE0},

	{Opt_resgid, 0, MOPT_GTE0},

	{Opt_resgid, 0, MOPT_GTE0},

	{Opt_journal_dev, 0, MOPT_GTE0},

	{Opt_journal_dev, 0, MOPT_NO_EXT2 | MOPT_GTE0},

	{Opt_journal_path, 0, MOPT_STRING},

	{Opt_journal_path, 0, MOPT_NO_EXT2 | MOPT_STRING},

	{Opt_journal_ioprio, 0, MOPT_GTE0},

	{Opt_journal_ioprio, 0, MOPT_NO_EXT2 | MOPT_GTE0},

	{Opt_data_journal, EXT4_MOUNT_JOURNAL_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},

	{Opt_data_journal, EXT4_MOUNT_JOURNAL_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},

	{Opt_data_ordered, EXT4_MOUNT_ORDERED_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},

	{Opt_data_ordered, EXT4_MOUNT_ORDERED_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},

	{Opt_data_writeback, EXT4_MOUNT_WRITEBACK_DATA,

	{Opt_data_writeback, EXT4_MOUNT_WRITEBACK_DATA,