From c7cd307eddb5fd836dad5b49451082168fd318e7 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Tue, 13 Oct 2009 13:50:18 -0400
Subject: [PATCH] --- yaml --- r: 167587 b: refs/heads/master c:
 0eda294dfc980c1cbe4f8a0564bf543f86a01ddb h: refs/heads/master i:   167585:
 f65ea6e76b69eef3f335ffd5e181f4390add1672   167583:
 f0519defa575030c8b5f939293e997a36c87c43a v: v3

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

diff --git a/[refs] b/[refs]
index 2343515f791d..eb0536fd7397 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 690587d109ffe19d6743e4cc80c18b0906b7f9ff
+refs/heads/master: 0eda294dfc980c1cbe4f8a0564bf543f86a01ddb
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index 69b355ae7f49..361604244271 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -27,7 +27,7 @@
 #include "btrfs_inode.h"
 #include "xattr.h"
 
-#ifdef CONFIG_BTRFS_POSIX_ACL
+#ifdef CONFIG_BTRFS_FS_POSIX_ACL
 
 static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 {
@@ -313,7 +313,7 @@ struct xattr_handler btrfs_xattr_acl_access_handler = {
 	.set	= btrfs_xattr_acl_access_set,
 };
 
-#else /* CONFIG_BTRFS_POSIX_ACL */
+#else /* CONFIG_BTRFS_FS_POSIX_ACL */
 
 int btrfs_acl_chmod(struct inode *inode)
 {
@@ -325,4 +325,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir)
 	return 0;
 }
 
-#endif /* CONFIG_BTRFS_POSIX_ACL */
+#endif /* CONFIG_BTRFS_FS_POSIX_ACL */
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index d0cede5ff25e..dfd7e6fc66d3 100644
--- a/trunk/fs/btrfs/ctree.h
+++ b/trunk/fs/btrfs/ctree.h
@@ -2374,7 +2374,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options);
 int btrfs_sync_fs(struct super_block *sb, int wait);
 
 /* acl.c */
-#ifdef CONFIG_BTRFS_POSIX_ACL
+#ifdef CONFIG_BTRFS_FS_POSIX_ACL
 int btrfs_check_acl(struct inode *inode, int mask);
 #else
 #define btrfs_check_acl NULL
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index e0a64328080c..3fbbf0761ac2 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -344,7 +344,7 @@ static int btrfs_fill_super(struct super_block *sb,
 	sb->s_export_op = &btrfs_export_ops;
 	sb->s_xattr = btrfs_xattr_handlers;
 	sb->s_time_gran = 1;
-#ifdef CONFIG_BTRFS_POSIX_ACL
+#ifdef CONFIG_BTRFS_FS_POSIX_ACL
 	sb->s_flags |= MS_POSIXACL;
 #endif
 
diff --git a/trunk/fs/btrfs/xattr.c b/trunk/fs/btrfs/xattr.c
index b0fc93f95fd0..b6dd5967c48a 100644
--- a/trunk/fs/btrfs/xattr.c
+++ b/trunk/fs/btrfs/xattr.c
@@ -260,7 +260,7 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
  * attributes are handled directly.
  */
 struct xattr_handler *btrfs_xattr_handlers[] = {
-#ifdef CONFIG_BTRFS_POSIX_ACL
+#ifdef CONFIG_BTRFS_FS_POSIX_ACL
 	&btrfs_xattr_acl_access_handler,
 	&btrfs_xattr_acl_default_handler,
 #endif