diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2011-07-14 03:17:39 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-08-01 14:30:48 -0400 |
| commit | 9b89d95a143bb0a9abc4ba0fdcdda78211930f1a (patch) | |
| tree | 353768825b985753b23fda0ec88e7cc85bf83346 /fs/btrfs/ctree.h | |
| parent | 15de900d08bb132833c8622610ddb1be660a6018 (diff) | |
| download | lwn-9b89d95a143bb0a9abc4ba0fdcdda78211930f1a.tar.gz lwn-9b89d95a143bb0a9abc4ba0fdcdda78211930f1a.zip | |
Btrfs: make acl functions really no-op if acl is not enabled
So there's no overhead for something we don't use.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 34ce4140bb41..a6263bdab818 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2650,12 +2650,21 @@ do { \ /* acl.c */ #ifdef CONFIG_BTRFS_FS_POSIX_ACL int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags); -#else -#define btrfs_check_acl NULL -#endif int btrfs_init_acl(struct btrfs_trans_handle *trans, struct inode *inode, struct inode *dir); int btrfs_acl_chmod(struct inode *inode); +#else +#define btrfs_check_acl NULL +static inline int btrfs_init_acl(struct btrfs_trans_handle *trans, + struct inode *inode, struct inode *dir) +{ + return 0; +} +static inline int btrfs_acl_chmod(struct inode *inode) +{ + return 0; +} +#endif /* relocation.c */ int btrfs_relocate_block_group(struct btrfs_root *root, u64 group_start); |