lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: Fix compile on kernel without ACLs enabled

Browse Source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Yan
2008-01-17 11:59:48 -05:00
committed by Chris Mason
parent 4d5e74bc0a
commit caaca38b8f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/Makefile
View File

@@ -5,8 +5,11 @@ obj-m := btrfs.o
btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
hash.o file-item.o inode-item.o inode-map.o disk-io.o \ hash.o file-item.o inode-item.o inode-map.o disk-io.o \
transaction.o bit-radix.o inode.o file.o tree-defrag.o \ transaction.o bit-radix.o inode.o file.o tree-defrag.o \
extent_map.o sysfs.o struct-funcs.o xattr.o acl.o ordered-data.o extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o
ifeq ($(CONFIG_FS_POSIX_ACL),y)
btrfs-y += acl.o
endif
#btrfs-y := ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \ #btrfs-y := ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
# root-tree.o dir-item.o hash.o file-item.o inode-item.o \ # root-tree.o dir-item.o hash.o file-item.o inode-item.o \
# inode-map.o \ # inode-map.o \

6
fs/btrfs/xattr.c
View File

@@ -26,20 +26,22 @@
#include "transaction.h" #include "transaction.h"
#include "xattr.h" #include "xattr.h"
#include "disk-io.h" #include "disk-io.h"
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
[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
[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
&btrfs_xattr_acl_access_handler, &btrfs_xattr_acl_access_handler,
&btrfs_xattr_acl_default_handler, &btrfs_xattr_acl_default_handler,
#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,