Commit eba12c7b authored by Yan's avatar Yan Committed by Chris Mason

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: default avatarChris Mason <chris.mason@oracle.com>
parent 51ebc0d3
...@@ -29,22 +29,22 @@ ...@@ -29,22 +29,22 @@
static struct xattr_handler *btrfs_xattr_handler_map[] = { static struct xattr_handler *btrfs_xattr_handler_map[] = {
[BTRFS_XATTR_INDEX_USER] = &btrfs_xattr_user_handler, [BTRFS_XATTR_INDEX_USER] = &btrfs_xattr_user_handler,
#ifdef CONFIG_FS_POSIX_ACL #ifdef CONFIG_FS_POSIX_ACL
[BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS] = &btrfs_xattr_acl_access_handler, // [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_DEFAULT] = &btrfs_xattr_acl_default_handler,
#endif #endif
[BTRFS_XATTR_INDEX_TRUSTED] = &btrfs_xattr_trusted_handler, [BTRFS_XATTR_INDEX_TRUSTED] = &btrfs_xattr_trusted_handler,
[BTRFS_XATTR_INDEX_SECURITY] = &btrfs_xattr_security_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[] = { struct xattr_handler *btrfs_xattr_handlers[] = {
&btrfs_xattr_user_handler, &btrfs_xattr_user_handler,
#ifdef CONFIG_FS_POSIX_ACL #ifdef CONFIG_FS_POSIX_ACL
&btrfs_xattr_acl_access_handler, // &btrfs_xattr_acl_access_handler,
&btrfs_xattr_acl_default_handler, // &btrfs_xattr_acl_default_handler,
#endif #endif
&btrfs_xattr_trusted_handler, &btrfs_xattr_trusted_handler,
&btrfs_xattr_security_handler, &btrfs_xattr_security_handler,
&btrfs_xattr_system_handler, // &btrfs_xattr_system_handler,
NULL, NULL,
}; };
......
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