From 148f3b15870aab5f17fcb2be8eed9cc5c352d38d Mon Sep 17 00:00:00 2001
From: Yan <yanzheng@21cn.com>
Date: Thu, 17 Jan 2008 11:59:48 -0500
Subject: [PATCH] --- yaml --- r: 128618 b: refs/heads/master c:
 caaca38b8fdcf63a17647fddae2195b189e19e37 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/btrfs/Makefile | 5 ++++-
 trunk/fs/btrfs/xattr.c  | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cc999d5f1ef6..7127e621f01f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d5e74bc0aec3f54b7e429d77b7c35de042c507d
+refs/heads/master: caaca38b8fdcf63a17647fddae2195b189e19e37
diff --git a/trunk/fs/btrfs/Makefile b/trunk/fs/btrfs/Makefile
index ab9a9f8edbf8..72cc3e16741f 100644
--- a/trunk/fs/btrfs/Makefile
+++ b/trunk/fs/btrfs/Makefile
@@ -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 \
 	   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 \
 #	  inode-map.o \
diff --git a/trunk/fs/btrfs/xattr.c b/trunk/fs/btrfs/xattr.c
index 4b3bd24af72b..0a4950400f85 100644
--- a/trunk/fs/btrfs/xattr.c
+++ b/trunk/fs/btrfs/xattr.c
@@ -26,20 +26,22 @@
 #include "transaction.h"
 #include "xattr.h"
 #include "disk-io.h"
-
 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,
 };
-
 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,