diff options
author | Yan <yanzheng@21cn.com> | 2008-06-09 22:21:46 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:03 -0400 |
commit | eba12c7bfcb4855fc757357e5e5b0b9a474499ba (patch) | |
tree | ef5e0b1ca6b2998bd781fb1a0c70c886d4b8aa5d /fs | |
parent | 51ebc0d3d5cd1a2728068499a8fc1bdb0a581ab5 (diff) |
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')
-rw-r--r-- | fs/btrfs/xattr.c | 12 |
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 @@ | |||
29 | static struct xattr_handler *btrfs_xattr_handler_map[] = { | 29 | static struct xattr_handler *btrfs_xattr_handler_map[] = { |
30 | [BTRFS_XATTR_INDEX_USER] = &btrfs_xattr_user_handler, | 30 | [BTRFS_XATTR_INDEX_USER] = &btrfs_xattr_user_handler, |
31 | #ifdef CONFIG_FS_POSIX_ACL | 31 | #ifdef CONFIG_FS_POSIX_ACL |
32 | [BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS] = &btrfs_xattr_acl_access_handler, | 32 | // [BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS] = &btrfs_xattr_acl_access_handler, |
33 | [BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT] = &btrfs_xattr_acl_default_handler, | 33 | // [BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT] = &btrfs_xattr_acl_default_handler, |
34 | #endif | 34 | #endif |
35 | [BTRFS_XATTR_INDEX_TRUSTED] = &btrfs_xattr_trusted_handler, | 35 | [BTRFS_XATTR_INDEX_TRUSTED] = &btrfs_xattr_trusted_handler, |
36 | [BTRFS_XATTR_INDEX_SECURITY] = &btrfs_xattr_security_handler, | 36 | [BTRFS_XATTR_INDEX_SECURITY] = &btrfs_xattr_security_handler, |
37 | [BTRFS_XATTR_INDEX_SYSTEM] = &btrfs_xattr_system_handler, | 37 | // [BTRFS_XATTR_INDEX_SYSTEM] = &btrfs_xattr_system_handler, |
38 | }; | 38 | }; |
39 | struct xattr_handler *btrfs_xattr_handlers[] = { | 39 | struct xattr_handler *btrfs_xattr_handlers[] = { |
40 | &btrfs_xattr_user_handler, | 40 | &btrfs_xattr_user_handler, |
41 | #ifdef CONFIG_FS_POSIX_ACL | 41 | #ifdef CONFIG_FS_POSIX_ACL |
42 | &btrfs_xattr_acl_access_handler, | 42 | // &btrfs_xattr_acl_access_handler, |
43 | &btrfs_xattr_acl_default_handler, | 43 | // &btrfs_xattr_acl_default_handler, |
44 | #endif | 44 | #endif |
45 | &btrfs_xattr_trusted_handler, | 45 | &btrfs_xattr_trusted_handler, |
46 | &btrfs_xattr_security_handler, | 46 | &btrfs_xattr_security_handler, |
47 | &btrfs_xattr_system_handler, | 47 | // &btrfs_xattr_system_handler, |
48 | NULL, | 48 | NULL, |
49 | }; | 49 | }; |
50 | 50 | ||