diff options
author | Josef Bacik <jbacik@redhat.com> | 2008-07-24 12:16:36 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:05 -0400 |
commit | 33268eaf0b3db5e2bd12c0ada81a8e8f87a46d68 (patch) | |
tree | 93b6d00a73402b59c2ea7ae7434138feecefc085 /fs/btrfs/super.c | |
parent | 6099afe88fe64b2f47c43a8a71c13be3a416bbf7 (diff) |
Btrfs: Add ACL support
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 4cb6aac5122e..a6a418b6894b 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -68,7 +68,7 @@ static void btrfs_put_super (struct super_block * sb) | |||
68 | enum { | 68 | enum { |
69 | Opt_degraded, Opt_subvol, Opt_device, Opt_nodatasum, Opt_nodatacow, | 69 | Opt_degraded, Opt_subvol, Opt_device, Opt_nodatasum, Opt_nodatacow, |
70 | Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, | 70 | Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, |
71 | Opt_ssd, Opt_thread_pool, Opt_err, | 71 | Opt_ssd, Opt_thread_pool, Opt_noacl, Opt_err, |
72 | }; | 72 | }; |
73 | 73 | ||
74 | static match_table_t tokens = { | 74 | static match_table_t tokens = { |
@@ -83,7 +83,8 @@ static match_table_t tokens = { | |||
83 | {Opt_alloc_start, "alloc_start=%s"}, | 83 | {Opt_alloc_start, "alloc_start=%s"}, |
84 | {Opt_thread_pool, "thread_pool=%d"}, | 84 | {Opt_thread_pool, "thread_pool=%d"}, |
85 | {Opt_ssd, "ssd"}, | 85 | {Opt_ssd, "ssd"}, |
86 | {Opt_err, NULL} | 86 | {Opt_noacl, "noacl"}, |
87 | {Opt_err, NULL}, | ||
87 | }; | 88 | }; |
88 | 89 | ||
89 | u64 btrfs_parse_size(char *str) | 90 | u64 btrfs_parse_size(char *str) |
@@ -215,6 +216,9 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
215 | info->alloc_start); | 216 | info->alloc_start); |
216 | } | 217 | } |
217 | break; | 218 | break; |
219 | case Opt_noacl: | ||
220 | root->fs_info->sb->s_flags &= ~MS_POSIXACL; | ||
221 | break; | ||
218 | default: | 222 | default: |
219 | break; | 223 | break; |
220 | } | 224 | } |
@@ -301,6 +305,7 @@ static int btrfs_fill_super(struct super_block * sb, | |||
301 | sb->s_op = &btrfs_super_ops; | 305 | sb->s_op = &btrfs_super_ops; |
302 | sb->s_xattr = btrfs_xattr_handlers; | 306 | sb->s_xattr = btrfs_xattr_handlers; |
303 | sb->s_time_gran = 1; | 307 | sb->s_time_gran = 1; |
308 | sb->s_flags |= MS_POSIXACL; | ||
304 | 309 | ||
305 | tree_root = open_ctree(sb, fs_devices, (char *)data); | 310 | tree_root = open_ctree(sb, fs_devices, (char *)data); |
306 | 311 | ||