Hello,
This patch fixes compile error on kernel without ACL.
Regards
YZ
---
diff -r ec7241de3db5 Makefile
--- a/Makefile Tue Jan 15 10:33:12 2008 -0500
+++ b/Makefile Thu Jan 17 01:31:13 2008 +0800
@@ -5,7 +5,11 @@ btrfs-y := super.o ctree.o extent-tree.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 \
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 \
# root-tree.o dir-item.o hash.o file-item.o inode-item.o \
diff -r ec7241de3db5 xattr.c
--- a/xattr.c Tue Jan 15 10:33:12 2008 -0500
+++ b/xattr.c Thu Jan 17 01:31:13 2008 +0800
@@ -29,8 +29,10 @@
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,
+#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,
@@ -38,8 +40,10 @@ static struct xattr_handler *btrfs_xattr
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,
+#endif
&btrfs_xattr_trusted_handler,
&btrfs_xattr_security_handler,
&btrfs_xattr_system_handler,
_______________________________________________
Btrfs-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/btrfs-devel
