Commit 33cf97a7 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

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: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cc68414c

fs/btrfs/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

fs/btrfs/acl.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* 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

fs/btrfs/ctree.h

+0 −18
Original line number Diff line number Diff line
@@ -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,

fs/btrfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include "uuid-tree.h"

#include "ioctl.h"

#include "file.h"

#include "acl.h"



struct btrfs_iget_args {

	u64 ino;