Commit 49cf6f45 authored by Chris Ball's avatar Chris Ball Committed by Chris Mason

Btrfs: Fix setting umask when POSIX ACLs are not enabled

We currently set sb->s_flags |= MS_POSIXACL unconditionally, which is
incorrect -- it tells the VFS that it shouldn't set umask because we
will, yet we don't set it ourselves if we aren't using POSIX ACLs, so
the umask ends up ignored.
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 9ed74f2d
...@@ -344,7 +344,9 @@ static int btrfs_fill_super(struct super_block *sb, ...@@ -344,7 +344,9 @@ static int btrfs_fill_super(struct super_block *sb,
sb->s_export_op = &btrfs_export_ops; sb->s_export_op = &btrfs_export_ops;
sb->s_xattr = btrfs_xattr_handlers; sb->s_xattr = btrfs_xattr_handlers;
sb->s_time_gran = 1; sb->s_time_gran = 1;
#ifdef CONFIG_BTRFS_POSIX_ACL
sb->s_flags |= MS_POSIXACL; sb->s_flags |= MS_POSIXACL;
#endif
tree_root = open_ctree(sb, fs_devices, (char *)data); tree_root = open_ctree(sb, fs_devices, (char *)data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment