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

btrfs: move fs wide helpers out of ctree.h 



We have several fs wide related helpers in ctree.h.  The bulk of these
are the incompat flag test helpers, but there are things such as
btrfs_fs_closing() and the read only helpers that also aren't directly
related to the ctree code.  Move these into a fs.h header, which will
serve as the location for file system wide related helpers.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.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 875c627c

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o \

	   uuid-tree.o props.o free-space-tree.o tree-checker.o space-info.o \

	   block-rsv.o delalloc-space.o block-group.o discard.o reflink.o \

	   subpage.o tree-mod-log.o extent-io-tree.o

	   subpage.o tree-mod-log.o extent-io-tree.o fs.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

fs/btrfs/backref.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "locking.h"

#include "misc.h"

#include "tree-mod-log.h"

#include "fs.h"



/* Just arbitrary numbers so we can be sure one of these happened. */

#define BACKREF_FOUND_SHARED     6

fs/btrfs/block-group.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "discard.h"

#include "raid56.h"

#include "zoned.h"

#include "fs.h"



#ifdef CONFIG_BTRFS_DEBUG

int btrfs_should_fragment_free_space(struct btrfs_block_group *block_group)

fs/btrfs/ctree.h

+0 −164
Original line number Diff line number Diff line
@@ -2857,44 +2857,6 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, 
			struct btrfs_root *root,

			struct extent_buffer *node,

			struct extent_buffer *parent);

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.

	 */

	if (test_bit(BTRFS_FS_CLOSING_START, &fs_info->flags)) {

		if (test_bit(BTRFS_FS_CLOSING_DONE, &fs_info->flags))

			return 2;

		return 1;

	}

	return 0;

}



/*

 * If we remount the fs to be R/O or umount the fs, the cleaner needn't do

 * anything except sleeping. This function is used to check the status of

 * the fs.

 * We check for BTRFS_FS_STATE_RO to avoid races with a concurrent remount,

 * since setting and checking for SB_RDONLY in the superblock's flags is not

 * atomic.

 */

static inline int btrfs_need_cleaner_sleep(struct btrfs_fs_info *fs_info)

{

	return test_bit(BTRFS_FS_STATE_RO, &fs_info->fs_state) ||

		btrfs_fs_closing(fs_info);

}



static inline void btrfs_set_sb_rdonly(struct super_block *sb)

{

	sb->s_flags |= SB_RDONLY;

	set_bit(BTRFS_FS_STATE_RO, &btrfs_sb(sb)->fs_state);

}



static inline void btrfs_clear_sb_rdonly(struct super_block *sb)

{

	sb->s_flags &= ~SB_RDONLY;

	clear_bit(BTRFS_FS_STATE_RO, &btrfs_sb(sb)->fs_state);

}



/* root-item.c */

int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id,
@@ -3529,132 +3491,6 @@ do { \ 
} while (0)





/* compatibility and incompatibility defines */



#define btrfs_set_fs_incompat(__fs_info, opt) \

	__btrfs_set_fs_incompat((__fs_info), BTRFS_FEATURE_INCOMPAT_##opt, \

				#opt)



static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info,

					   u64 flag, const char* name)

{

	struct btrfs_super_block *disk_super;

	u64 features;



	disk_super = fs_info->super_copy;

	features = btrfs_super_incompat_flags(disk_super);

	if (!(features & flag)) {

		spin_lock(&fs_info->super_lock);

		features = btrfs_super_incompat_flags(disk_super);

		if (!(features & flag)) {

			features |= flag;

			btrfs_set_super_incompat_flags(disk_super, features);

			btrfs_info(fs_info,

				"setting incompat feature flag for %s (0x%llx)",

				name, flag);

		}

		spin_unlock(&fs_info->super_lock);

	}

}



#define btrfs_clear_fs_incompat(__fs_info, opt) \

	__btrfs_clear_fs_incompat((__fs_info), BTRFS_FEATURE_INCOMPAT_##opt, \

				  #opt)



static inline void __btrfs_clear_fs_incompat(struct btrfs_fs_info *fs_info,

					     u64 flag, const char* name)

{

	struct btrfs_super_block *disk_super;

	u64 features;



	disk_super = fs_info->super_copy;

	features = btrfs_super_incompat_flags(disk_super);

	if (features & flag) {

		spin_lock(&fs_info->super_lock);

		features = btrfs_super_incompat_flags(disk_super);

		if (features & flag) {

			features &= ~flag;

			btrfs_set_super_incompat_flags(disk_super, features);

			btrfs_info(fs_info,

				"clearing incompat feature flag for %s (0x%llx)",

				name, flag);

		}

		spin_unlock(&fs_info->super_lock);

	}

}



#define btrfs_fs_incompat(fs_info, opt) \

	__btrfs_fs_incompat((fs_info), BTRFS_FEATURE_INCOMPAT_##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);

}



#define btrfs_set_fs_compat_ro(__fs_info, opt) \

	__btrfs_set_fs_compat_ro((__fs_info), BTRFS_FEATURE_COMPAT_RO_##opt, \

				 #opt)



static inline void __btrfs_set_fs_compat_ro(struct btrfs_fs_info *fs_info,

					    u64 flag, const char *name)

{

	struct btrfs_super_block *disk_super;

	u64 features;



	disk_super = fs_info->super_copy;

	features = btrfs_super_compat_ro_flags(disk_super);

	if (!(features & flag)) {

		spin_lock(&fs_info->super_lock);

		features = btrfs_super_compat_ro_flags(disk_super);

		if (!(features & flag)) {

			features |= flag;

			btrfs_set_super_compat_ro_flags(disk_super, features);

			btrfs_info(fs_info,

				"setting compat-ro feature flag for %s (0x%llx)",

				name, flag);

		}

		spin_unlock(&fs_info->super_lock);

	}

}



#define btrfs_clear_fs_compat_ro(__fs_info, opt) \

	__btrfs_clear_fs_compat_ro((__fs_info), BTRFS_FEATURE_COMPAT_RO_##opt, \

				   #opt)



static inline void __btrfs_clear_fs_compat_ro(struct btrfs_fs_info *fs_info,

					      u64 flag, const char *name)

{

	struct btrfs_super_block *disk_super;

	u64 features;



	disk_super = fs_info->super_copy;

	features = btrfs_super_compat_ro_flags(disk_super);

	if (features & flag) {

		spin_lock(&fs_info->super_lock);

		features = btrfs_super_compat_ro_flags(disk_super);

		if (features & flag) {

			features &= ~flag;

			btrfs_set_super_compat_ro_flags(disk_super, features);

			btrfs_info(fs_info,

				"clearing compat-ro feature flag for %s (0x%llx)",

				name, flag);

		}

		spin_unlock(&fs_info->super_lock);

	}

}



#define btrfs_fs_compat_ro(fs_info, opt) \

	__btrfs_fs_compat_ro((fs_info), BTRFS_FEATURE_COMPAT_RO_##opt)



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);

}



/* acl.c */

#ifdef CONFIG_BTRFS_FS_POSIX_ACL

struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu);

fs/btrfs/disk-io.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "space-info.h"

#include "zoned.h"

#include "subpage.h"

#include "fs.h"



#define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN |\

				 BTRFS_HEADER_FLAG_RELOC |\