iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: explicit mount options parsing cleanup

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

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Dmitry Monakhov 2015-10-18 23:35:32 -04:00 committed by Theodore Ts'o
parent 4327ba52af
commit c93cf2d757
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ext4/super.c
View File

@ -1516,8 +1516,12 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
return -1; return -1;
if (args->from && (m->flags & MOPT_GTE0) && (arg < 0)) if (args->from && (m->flags & MOPT_GTE0) && (arg < 0))
return -1; return -1;
if (m->flags & MOPT_EXPLICIT) if (m->flags & MOPT_EXPLICIT) {
set_opt2(sb, EXPLICIT_DELALLOC); if (m->mount_opt & EXT4_MOUNT_DELALLOC) {
set_opt2(sb, EXPLICIT_DELALLOC);
} else
return -1;
}
if (m->flags & MOPT_CLEAR_ERR) if (m->flags & MOPT_CLEAR_ERR)
clear_opt(sb, ERRORS_MASK); clear_opt(sb, ERRORS_MASK);
if (token == Opt_noquota && sb_any_quota_loaded(sb)) { if (token == Opt_noquota && sb_any_quota_loaded(sb)) {