mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
Btrfs: Use CONFIG_BTRFS_POSIX_ACL to enable ACL code
We've already defined CONFIG_BTRFS_POSIX_ACL in Kconfig, but we're currently not using it and are testing CONFIG_FS_POSIX_ACL instead. CONFIG_FS_POSIX_ACL states "Never use this symbol for ifdefs". Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
parent
fd2696f399
commit
3baf0bed0a
3 changed files with 5 additions and 5 deletions
|
@ -27,7 +27,7 @@
|
|||
#include "btrfs_inode.h"
|
||||
#include "xattr.h"
|
||||
|
||||
#ifdef CONFIG_FS_POSIX_ACL
|
||||
#ifdef CONFIG_BTRFS_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_FS_POSIX_ACL */
|
||||
#else /* CONFIG_BTRFS_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_FS_POSIX_ACL */
|
||||
#endif /* CONFIG_BTRFS_POSIX_ACL */
|
||||
|
|
|
@ -2366,7 +2366,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_FS_POSIX_ACL
|
||||
#ifdef CONFIG_BTRFS_POSIX_ACL
|
||||
int btrfs_check_acl(struct inode *inode, int mask);
|
||||
#else
|
||||
#define btrfs_check_acl NULL
|
||||
|
|
|
@ -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_FS_POSIX_ACL
|
||||
#ifdef CONFIG_BTRFS_POSIX_ACL
|
||||
&btrfs_xattr_acl_access_handler,
|
||||
&btrfs_xattr_acl_default_handler,
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue