aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
authorQu Wenruo <quwenruo@cn.fujitsu.com>2014-01-05 20:58:30 -0500
committerChris Mason <clm@fb.com>2014-01-28 16:20:19 -0500
commitbd0330ad2174d1a5f762eee2ee58f0148f10d575 (patch)
tree9360380cc882b29c724af85f06ec95b26893bcf2 /fs/btrfs/super.c
parent2c9ee85671f66cd3ffc7067de47cc59ed6677299 (diff)
btrfs: Add acl mount option.
Add acl mount option to enable acl with remount option. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Reviewed-by: David Sterba <dsterba@suse.cz> Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 98a682340935..76eecd13db19 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -324,7 +324,7 @@ enum {
324 Opt_check_integrity, Opt_check_integrity_including_extent_data, 324 Opt_check_integrity, Opt_check_integrity_including_extent_data,
325 Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree, 325 Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree,
326 Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard, 326 Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
327 Opt_noenospc_debug, Opt_noflushoncommit, 327 Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl,
328 Opt_err, 328 Opt_err,
329}; 329};
330 330
@@ -347,6 +347,7 @@ static match_table_t tokens = {
347 {Opt_ssd, "ssd"}, 347 {Opt_ssd, "ssd"},
348 {Opt_ssd_spread, "ssd_spread"}, 348 {Opt_ssd_spread, "ssd_spread"},
349 {Opt_nossd, "nossd"}, 349 {Opt_nossd, "nossd"},
350 {Opt_acl, "acl"},
350 {Opt_noacl, "noacl"}, 351 {Opt_noacl, "noacl"},
351 {Opt_notreelog, "notreelog"}, 352 {Opt_notreelog, "notreelog"},
352 {Opt_flushoncommit, "flushoncommit"}, 353 {Opt_flushoncommit, "flushoncommit"},
@@ -552,6 +553,9 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
552 goto out; 553 goto out;
553 } 554 }
554 break; 555 break;
556 case Opt_acl:
557 root->fs_info->sb->s_flags |= MS_POSIXACL;
558 break;
555 case Opt_noacl: 559 case Opt_noacl:
556 root->fs_info->sb->s_flags &= ~MS_POSIXACL; 560 root->fs_info->sb->s_flags &= ~MS_POSIXACL;
557 break; 561 break;