Commit 0eda294d authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: fix btrfs acl #ifdef checks



The btrfs acl code was #ifdefing for a define
that didn't exist.  This correctly matches it
to the values used by the Kconfig file.
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 690587d1
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "btrfs_inode.h" #include "btrfs_inode.h"
#include "xattr.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) static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
{ {
...@@ -313,7 +313,7 @@ struct xattr_handler btrfs_xattr_acl_access_handler = { ...@@ -313,7 +313,7 @@ struct xattr_handler btrfs_xattr_acl_access_handler = {
.set = btrfs_xattr_acl_access_set, .set = btrfs_xattr_acl_access_set,
}; };
#else /* CONFIG_BTRFS_POSIX_ACL */ #else /* CONFIG_BTRFS_FS_POSIX_ACL */
int btrfs_acl_chmod(struct inode *inode) int btrfs_acl_chmod(struct inode *inode)
{ {
...@@ -325,4 +325,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir) ...@@ -325,4 +325,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir)
return 0; return 0;
} }
#endif /* CONFIG_BTRFS_POSIX_ACL */ #endif /* CONFIG_BTRFS_FS_POSIX_ACL */
...@@ -2374,7 +2374,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options); ...@@ -2374,7 +2374,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options);
int btrfs_sync_fs(struct super_block *sb, int wait); int btrfs_sync_fs(struct super_block *sb, int wait);
/* acl.c */ /* acl.c */
#ifdef CONFIG_BTRFS_POSIX_ACL #ifdef CONFIG_BTRFS_FS_POSIX_ACL
int btrfs_check_acl(struct inode *inode, int mask); int btrfs_check_acl(struct inode *inode, int mask);
#else #else
#define btrfs_check_acl NULL #define btrfs_check_acl NULL
......
...@@ -344,7 +344,7 @@ static int btrfs_fill_super(struct super_block *sb, ...@@ -344,7 +344,7 @@ static int btrfs_fill_super(struct super_block *sb,
sb->s_export_op = &btrfs_export_ops; sb->s_export_op = &btrfs_export_ops;
sb->s_xattr = btrfs_xattr_handlers; sb->s_xattr = btrfs_xattr_handlers;
sb->s_time_gran = 1; sb->s_time_gran = 1;
#ifdef CONFIG_BTRFS_POSIX_ACL #ifdef CONFIG_BTRFS_FS_POSIX_ACL
sb->s_flags |= MS_POSIXACL; sb->s_flags |= MS_POSIXACL;
#endif #endif
......
...@@ -260,7 +260,7 @@ err: ...@@ -260,7 +260,7 @@ err:
* attributes are handled directly. * attributes are handled directly.
*/ */
struct xattr_handler *btrfs_xattr_handlers[] = { 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_access_handler,
&btrfs_xattr_acl_default_handler, &btrfs_xattr_acl_default_handler,
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment