Commit 0d3a9cf8 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: convert incompat and compat flag test helpers to macros 



These helpers use functions not defined in fs.h, they're simply
accessors of the super block in fs_info, convert them to macros so
that we don't have a weird dependency between fs.h and accessors.h.

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 ec8eb376

fs/btrfs/fs.h

+6 −14
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ void __btrfs_set_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag, 
void __btrfs_clear_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag,

				const char *name);



#define __btrfs_fs_incompat(fs_info, flags)				\

	(!!(btrfs_super_incompat_flags((fs_info)->super_copy) & (flags)))



#define __btrfs_fs_compat_ro(fs_info, flags)				\

	(!!(btrfs_super_compat_ro_flags((fs_info)->super_copy) & (flags)))



#define btrfs_set_fs_incompat(__fs_info, opt)				\

	__btrfs_set_fs_incompat((__fs_info), BTRFS_FEATURE_INCOMPAT_##opt, #opt)
@@ -62,20 +68,6 @@ void __btrfs_clear_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag, 
#define btrfs_fs_compat_ro(fs_info, opt)				\

	__btrfs_fs_compat_ro((fs_info), BTRFS_FEATURE_COMPAT_RO_##opt)



static inline bool __btrfs_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag)

{

	struct btrfs_super_block *disk_super;

	disk_super = fs_info->super_copy;

	return !!(btrfs_super_incompat_flags(disk_super) & flag);

}



static inline int __btrfs_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag)

{

	struct btrfs_super_block *disk_super;

	disk_super = fs_info->super_copy;

	return !!(btrfs_super_compat_ro_flags(disk_super) & flag);

}



static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)

{

	/* Do it this way so we only ever do one test_bit in the normal case. */