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

Commit 59d9fa5c authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: allow the mount options nodelalloc and data=journal 



Commit 26092bf5 ("ext4: use a table-driven handler for mount options")
wrongly disallows the specifying the mount options nodelalloc and
data=journal simultaneously.  This is incorrect; it should have only
disallowed the combination of delalloc and data=journal
simultaneously.

Reported-by: default avatarPiotr Sarna <p.sarna@partner.samsung.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 44fb851d

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ static const struct mount_opts { 
	{Opt_delalloc, EXT4_MOUNT_DELALLOC,

	 MOPT_EXT4_ONLY | MOPT_SET | MOPT_EXPLICIT},

	{Opt_nodelalloc, EXT4_MOUNT_DELALLOC,

	 MOPT_EXT4_ONLY | MOPT_CLEAR | MOPT_EXPLICIT},

	 MOPT_EXT4_ONLY | MOPT_CLEAR},

	{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,

	 MOPT_EXT4_ONLY | MOPT_SET},

	{Opt_journal_async_commit, (EXT4_MOUNT_JOURNAL_ASYNC_COMMIT |