summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorYan <yanzheng@21cn.com>2008-06-09 22:21:46 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:03 -0400
commiteba12c7bfcb4855fc757357e5e5b0b9a474499ba (patch)
treeef5e0b1ca6b2998bd781fb1a0c70c886d4b8aa5d /fs/btrfs
parent51ebc0d3d5cd1a2728068499a8fc1bdb0a581ab5 (diff)
downloadlinux-eba12c7bfcb4855fc757357e5e5b0b9a474499ba.tar.gz
linux-eba12c7bfcb4855fc757357e5e5b0b9a474499ba.tar.bz2
linux-eba12c7bfcb4855fc757357e5e5b0b9a474499ba.zip
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/xattr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 0a4950400f85..f63488dc2f16 100644
--- 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,
};