From: Chris Ball <cjb@laptop.org>
Date: Tue, 29 Sep 2009 17:51:04 +0000 (-0400)
Subject: Btrfs: Fix setting umask when POSIX ACLs are not enabled
X-Git-Tag: v3.12-rc1~12331^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49cf6f4529b7945ef51b8e39f0bac630726f8c96;p=kernel%2Fkernel-generic.git

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>
---

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0242c8b..e0a6432 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);