diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2022-10-26 15:08:33 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-12-05 18:00:46 +0100 |
| commit | 33cf97a7b6585efc57c1277b9e346afa7c542999 (patch) | |
| tree | 713f54f98d8b03245d3f9985bc0676a70e194cfc | |
| parent | cc68414c6123fcc436c96d8920f48120b0ca2613 (diff) | |
btrfs: move acl prototypes into acl.h
Move these out of ctree.h into acl.h to cut down on code in ctree.h.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/acl.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/acl.h | 27 | ||||
| -rw-r--r-- | fs/btrfs/ctree.h | 18 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 1 |
4 files changed, 29 insertions, 19 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 548d6a5477b4..100bae33c677 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -11,10 +11,10 @@ #include <linux/sched.h> #include <linux/sched/mm.h> #include <linux/slab.h> - #include "ctree.h" #include "btrfs_inode.h" #include "xattr.h" +#include "acl.h" struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu) { diff --git a/fs/btrfs/acl.h b/fs/btrfs/acl.h new file mode 100644 index 000000000000..45197b4f73bf --- /dev/null +++ b/fs/btrfs/acl.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef BTRFS_ACL_H +#define BTRFS_ACL_H + +#ifdef CONFIG_BTRFS_FS_POSIX_ACL + +struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu); +int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, + struct posix_acl *acl, int type); +int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, + struct posix_acl *acl, int type); + +#else + +#define btrfs_get_acl NULL +#define btrfs_set_acl NULL +static inline int __btrfs_set_acl(struct btrfs_trans_handle *trans, + struct inode *inode, struct posix_acl *acl, + int type) +{ + return -EOPNOTSUPP; +} + +#endif + +#endif diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index dcbfb1b9d269..040b640b0222 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -732,24 +732,6 @@ static inline unsigned long get_eb_page_index(unsigned long offset) #define EXPORT_FOR_TESTS #endif -/* acl.c */ -#ifdef CONFIG_BTRFS_FS_POSIX_ACL -struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu); -int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, - struct posix_acl *acl, int type); -int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, - struct posix_acl *acl, int type); -#else -#define btrfs_get_acl NULL -#define btrfs_set_acl NULL -static inline int __btrfs_set_acl(struct btrfs_trans_handle *trans, - struct inode *inode, struct posix_acl *acl, - int type) -{ - return -EOPNOTSUPP; -} -#endif - /* relocation.c */ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start); int btrfs_init_reloc_root(struct btrfs_trans_handle *trans, diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3fe3301b88b3..cb038dbbca7d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -65,6 +65,7 @@ #include "uuid-tree.h" #include "ioctl.h" #include "file.h" +#include "acl.h" struct btrfs_iget_args { u64 ino; |