diff options
| author | Chris Ball <cjb@laptop.org> | 2009-09-29 13:51:04 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-29 13:51:04 -0400 |
| commit | 49cf6f4529b7945ef51b8e39f0bac630726f8c96 (patch) | |
| tree | 27c91f6bb1ac0e4862286e78d1365e2890754cef /fs | |
| parent | 9ed74f2dba6ebf9f30b80554290bfc73cc3ef083 (diff) | |
| download | linux-stable-49cf6f4529b7945ef51b8e39f0bac630726f8c96.tar.gz linux-stable-49cf6f4529b7945ef51b8e39f0bac630726f8c96.tar.bz2 linux-stable-49cf6f4529b7945ef51b8e39f0bac630726f8c96.zip | |
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: Chris Ball <cjb@laptop.org>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 0242c8babae9..e0a64328080c 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -344,7 +344,9 @@ static int btrfs_fill_super(struct super_block *sb, sb->s_export_op = &btrfs_export_ops; sb->s_xattr = btrfs_xattr_handlers; sb->s_time_gran = 1; +#ifdef CONFIG_BTRFS_POSIX_ACL sb->s_flags |= MS_POSIXACL; +#endif tree_root = open_ctree(sb, fs_devices, (char *)data); |