Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
fs/ntfs3: allow explicit boolean acl/prealloc mount options
This patch improves mount option parsing by allowing explicit boolean
values for acl and prealloc. Previously those options were exposed only
as presence/absence flags.
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
+14
-6
+14
-6
fs/ntfs3/super.c
+14
-6
fs/ntfs3/super.c
···
264
264
Opt_windows_names,
265
265
Opt_showmeta,
266
266
Opt_acl,
267
+
Opt_acl_bool,
267
268
Opt_iocharset,
268
269
Opt_prealloc,
270
+
Opt_prealloc_bool,
269
271
Opt_nocase,
270
272
Opt_err,
271
273
};
···
287
285
fsparam_flag("hide_dot_files", Opt_hide_dot_files),
288
286
fsparam_flag("windows_names", Opt_windows_names),
289
287
fsparam_flag("showmeta", Opt_showmeta),
290
-
fsparam_flag_no("acl", Opt_acl),
288
+
fsparam_flag("acl", Opt_acl),
289
+
fsparam_bool("acl", Opt_acl_bool),
291
290
fsparam_string("iocharset", Opt_iocharset),
292
-
fsparam_flag_no("prealloc", Opt_prealloc),
291
+
fsparam_flag("prealloc", Opt_prealloc),
292
+
fsparam_bool("prealloc", Opt_prealloc_bool),
293
293
fsparam_flag("nocase", Opt_nocase),
294
294
{}
295
295
};
···
383
379
case Opt_showmeta:
384
380
opts->showmeta = 1;
385
381
break;
386
-
case Opt_acl:
387
-
if (!result.negated)
382
+
case Opt_acl_bool:
383
+
if (result.boolean) {
384
+
case Opt_acl:
388
385
#ifdef CONFIG_NTFS3_FS_POSIX_ACL
389
386
fc->sb_flags |= SB_POSIXACL;
390
387
#else
391
388
return invalf(
392
389
fc, "ntfs3: Support for ACL not compiled in!");
393
390
#endif
394
-
else
391
+
} else
395
392
fc->sb_flags &= ~SB_POSIXACL;
396
393
break;
397
394
case Opt_iocharset:
···
401
396
param->string = NULL;
402
397
break;
403
398
case Opt_prealloc:
404
-
opts->prealloc = !result.negated;
399
+
opts->prealloc = 1;
400
+
break;
401
+
case Opt_prealloc_bool:
402
+
opts->prealloc = result.boolean;
405
403
break;
406
404
case Opt_nocase:
407
405
opts->nocase = 1;