Btrfs: compile when posix acl's are disabled

This patch makes btrfs so it will compile properly when acls are disabled.  I
tested this and it worked with CONFIG_FS_POSIX_ACL off and on.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 8213bba1de9fc1f0d04bc1eec6afc56d60ec4d10..3a01065d4ef11e2941538f99bb52ae22155a9254 100644 (file)
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -7,9 +7,8 @@ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
           transaction.o bit-radix.o inode.o file.o tree-defrag.o \
           extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
           extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
-          ref-cache.o export.o
+          ref-cache.o acl.o export.o
 
-btrfs-$(CONFIG_FS_POSIX_ACL)   += acl.o
 else
 
 # Normal Makefile

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index b192659b4f5f6c33c69daec38a4da07f0b17cc92..b95147ef1c777dd349839951e76528f0d7eb39a1 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -27,6 +27,8 @@
 #include "btrfs_inode.h"
 #include "xattr.h"
 
+#ifdef CONFIG_FS_POSIX_ACL
+
 static void btrfs_update_cached_acl(struct inode *inode,
                                    struct posix_acl **p_acl,
                                    struct posix_acl *acl)
@@ -329,3 +331,22 @@ struct xattr_handler btrfs_xattr_acl_access_handler = {
        .get    = btrfs_xattr_acl_access_get,
        .set    = btrfs_xattr_acl_access_set,
 };
+
+#else /* CONFIG_FS_POSIX_ACL */
+
+int btrfs_acl_chmod(struct inode *inode)
+{
+       return 0;
+}
+
+int btrfs_init_acl(struct inode *inode, struct inode *dir)
+{
+       return 0;
+}
+
+int btrfs_check_acl(struct inode *inode, int mask)
+{
+       return 0;
+}
+
+#endif /* CONFIG_FS_POSIX_ACL */