summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/xattr.c
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2009-09-29 13:51:05 -0400
committerChris Mason <chris.mason@oracle.com>2009-09-29 13:51:05 -0400
commit3baf0bed0a5adab95c7599d2f27124c74692ef28 (patch)
treefff0aae377d71743ab4d95449bf57419280555b3 /fs/btrfs/xattr.c
parentfd2696f399e45347c07f1f7f340e8515cace5657 (diff)
downloadkernel-crypto-3baf0bed0a5adab95c7599d2f27124c74692ef28.tar.gz
kernel-crypto-3baf0bed0a5adab95c7599d2f27124c74692ef28.tar.xz
kernel-crypto-3baf0bed0a5adab95c7599d2f27124c74692ef28.zip
Btrfs: Use CONFIG_BTRFS_POSIX_ACL to enable ACL code
We've already defined CONFIG_BTRFS_POSIX_ACL in Kconfig, but we're currently not using it and are testing CONFIG_FS_POSIX_ACL instead. CONFIG_FS_POSIX_ACL states "Never use this symbol for ifdefs". Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/xattr.c')
-rw-r--r--fs/btrfs/xattr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index a9d3bf4d268..b0fc93f95fd 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -260,7 +260,7 @@ err:
* attributes are handled directly.
*/
struct xattr_handler *btrfs_xattr_handlers[] = {
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_BTRFS_POSIX_ACL
&btrfs_xattr_acl_access_handler,
&btrfs_xattr_acl_default_handler,
#endif