Btrfs: Dislable acl xattr handlers

The acl code is not yet complete, and the xattr handlers are causing
problems for cp -p on some distros.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 0a4950400f852999ba883f99064a7bebbea61215..f63488dc2f162400a75ea2b6fad26abc3bd91d04 100644 (file)
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -29,22 +29,22 @@
 static struct xattr_handler *btrfs_xattr_handler_map[] = {
        [BTRFS_XATTR_INDEX_USER]                = &btrfs_xattr_user_handler,
 #ifdef CONFIG_FS_POSIX_ACL
-       [BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS]    = &btrfs_xattr_acl_access_handler,
-       [BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT]   = &btrfs_xattr_acl_default_handler,
+//     [BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS]    = &btrfs_xattr_acl_access_handler,
+//     [BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT]   = &btrfs_xattr_acl_default_handler,
 #endif
        [BTRFS_XATTR_INDEX_TRUSTED]             = &btrfs_xattr_trusted_handler,
        [BTRFS_XATTR_INDEX_SECURITY]            = &btrfs_xattr_security_handler,
-       [BTRFS_XATTR_INDEX_SYSTEM]              = &btrfs_xattr_system_handler,
+//     [BTRFS_XATTR_INDEX_SYSTEM]              = &btrfs_xattr_system_handler,
 };
 struct xattr_handler *btrfs_xattr_handlers[] = {
        &btrfs_xattr_user_handler,
 #ifdef CONFIG_FS_POSIX_ACL
-       &btrfs_xattr_acl_access_handler,
-       &btrfs_xattr_acl_default_handler,
+//     &btrfs_xattr_acl_access_handler,
+//     &btrfs_xattr_acl_default_handler,
 #endif
        &btrfs_xattr_trusted_handler,
        &btrfs_xattr_security_handler,
-       &btrfs_xattr_system_handler,
+//     &btrfs_xattr_system_handler,
        NULL,
 };