diff options
| author | Guangliang Zhao | 2014-05-12 05:04:33 +0200 |
|---|---|---|
| committer | Chris Mason | 2014-06-10 02:20:50 +0200 |
| commit | 45ff35d6b9f301cbfb6b1703466ebe4431c7567f (patch) | |
| tree | 132be574205b90ce90fd5ca723fa99f9914ddc19 /fs | |
| parent | Btrfs: add sanity tests for new qgroup accounting code (diff) | |
| download | kernel-qcow2-linux-45ff35d6b9f301cbfb6b1703466ebe4431c7567f.tar.gz kernel-qcow2-linux-45ff35d6b9f301cbfb6b1703466ebe4431c7567f.tar.xz kernel-qcow2-linux-45ff35d6b9f301cbfb6b1703466ebe4431c7567f.zip | |
Btrfs: remove OPT_acl parse when acl disabled
Even CONFIG_BTRFS_FS_POSIX_ACL is not defined, the acl still could
been enabled using a mount option, and now fs/btrfs/acl.o is not
built, so the mount options will appear to be supported but will
be silently ignored.
Signed-off-by: Guangliang Zhao <lucienchao@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index d80a2786f563..77fcb5706700 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -580,8 +580,15 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) } break; case Opt_acl: +#ifdef CONFIG_BTRFS_FS_POSIX_ACL root->fs_info->sb->s_flags |= MS_POSIXACL; break; +#else + btrfs_err(root->fs_info, + "support for ACL not compiled in!"); + ret = -EINVAL; + goto out; +#endif case Opt_noacl: root->fs_info->sb->s_flags &= ~MS_POSIXACL; break; |