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

Commit c93cf2d7 authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Theodore Ts'o
Browse files

ext4: explicit mount options parsing cleanup 



Currently MOPT_EXPLICIT treated as EXPLICIT_DELALLOC which may be changed
in future. Let's fix it now.

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 4327ba52

fs/ext4/super.c

+6 −2
Original line number Diff line number Diff line
@@ -1516,8 +1516,12 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, 
		return -1;

	if (args->from && (m->flags & MOPT_GTE0) && (arg < 0))

		return -1;

	if (m->flags & MOPT_EXPLICIT)

	if (m->flags & MOPT_EXPLICIT) {

		if (m->mount_opt & EXT4_MOUNT_DELALLOC) {

			set_opt2(sb, EXPLICIT_DELALLOC);

		} else

			return -1;

	}

	if (m->flags & MOPT_CLEAR_ERR)

		clear_opt(sb, ERRORS_MASK);

	if (token == Opt_noquota && sb_any_quota_loaded(sb)) {