From a0998a885887e160d33b9c1f122357aaafd68625 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Wed, 10 Jun 2009 11:36:43 -0400
Subject: [PATCH] --- yaml --- r: 147777 b: refs/heads/master c:
 7df336ec1266dccbb253bac52c529d3dcc7c22d0 h: refs/heads/master i:   147775:
 c1ce99c2dfec664e93e87eb5e3b1e773f07e8e28 v: v3

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

diff --git a/[refs] b/[refs]
index 945c4b00c49d..d37ee135fae4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 524724ed1f224875a117be593540591ed050c73d
+refs/heads/master: 7df336ec1266dccbb253bac52c529d3dcc7c22d0
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index cbba000dccbe..603972576f0f 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -351,9 +351,4 @@ 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 */
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index 4d6e0b6f21ea..03441a99ea38 100644
--- a/trunk/fs/btrfs/ctree.h
+++ b/trunk/fs/btrfs/ctree.h
@@ -2301,7 +2301,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options);
 int btrfs_sync_fs(struct super_block *sb, int wait);
 
 /* acl.c */
+#ifdef CONFIG_FS_POSIX_ACL
 int btrfs_check_acl(struct inode *inode, int mask);
+#else
+#define btrfs_check_acl NULL
+#endif
 int btrfs_init_acl(struct inode *inode, struct inode *dir);
 int btrfs_acl_chmod(struct inode *inode);