diff options
author | Yan <yanzheng@21cn.com> | 2008-01-17 11:59:48 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:03:59 -0400 |
commit | caaca38b8fdcf63a17647fddae2195b189e19e37 (patch) | |
tree | 635bceedd564afcf56f26b139dd85d0f88a5ef8e /fs/btrfs/xattr.c | |
parent | 4d5e74bc0aec3f54b7e429d77b7c35de042c507d (diff) |
Btrfs: Fix compile on kernel without ACLs enabled
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/xattr.c')
-rw-r--r-- | fs/btrfs/xattr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 4b3bd24af72b..0a4950400f85 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c | |||
@@ -26,20 +26,22 @@ | |||
26 | #include "transaction.h" | 26 | #include "transaction.h" |
27 | #include "xattr.h" | 27 | #include "xattr.h" |
28 | #include "disk-io.h" | 28 | #include "disk-io.h" |
29 | |||
30 | static struct xattr_handler *btrfs_xattr_handler_map[] = { | 29 | static struct xattr_handler *btrfs_xattr_handler_map[] = { |
31 | [BTRFS_XATTR_INDEX_USER] = &btrfs_xattr_user_handler, | 30 | [BTRFS_XATTR_INDEX_USER] = &btrfs_xattr_user_handler, |
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 | [BTRFS_XATTR_INDEX_TRUSTED] = &btrfs_xattr_trusted_handler, | 35 | [BTRFS_XATTR_INDEX_TRUSTED] = &btrfs_xattr_trusted_handler, |
35 | [BTRFS_XATTR_INDEX_SECURITY] = &btrfs_xattr_security_handler, | 36 | [BTRFS_XATTR_INDEX_SECURITY] = &btrfs_xattr_security_handler, |
36 | [BTRFS_XATTR_INDEX_SYSTEM] = &btrfs_xattr_system_handler, | 37 | [BTRFS_XATTR_INDEX_SYSTEM] = &btrfs_xattr_system_handler, |
37 | }; | 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 | &btrfs_xattr_acl_access_handler, | 42 | &btrfs_xattr_acl_access_handler, |
42 | &btrfs_xattr_acl_default_handler, | 43 | &btrfs_xattr_acl_default_handler, |
44 | #endif | ||
43 | &btrfs_xattr_trusted_handler, | 45 | &btrfs_xattr_trusted_handler, |
44 | &btrfs_xattr_security_handler, | 46 | &btrfs_xattr_security_handler, |
45 | &btrfs_xattr_system_handler, | 47 | &btrfs_xattr_system_handler, |