Commit 2ef2e97f authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

btrfs: move space_info_flag_to_str() to space-info.h 



Move space_info_flag_to_str() to space-info.h and as it now isn't static
to space-info.c any more prefix it with 'btrfs_'.

This way it can be re-used in other places.

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6a5ac228

fs/btrfs/space-info.c

+1 −17
Original line number Diff line number Diff line
@@ -606,22 +606,6 @@ do { \ 
	spin_unlock(&__rsv->lock);					\

} while (0)



static const char *space_info_flag_to_str(const struct btrfs_space_info *space_info)

{

	switch (space_info->flags) {

	case BTRFS_BLOCK_GROUP_SYSTEM:

		return "SYSTEM";

	case BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA:

		return "DATA+METADATA";

	case BTRFS_BLOCK_GROUP_DATA:

		return "DATA";

	case BTRFS_BLOCK_GROUP_METADATA:

		return "METADATA";

	default:

		return "UNKNOWN";

	}

}



static void dump_global_block_rsv(struct btrfs_fs_info *fs_info)

{

	DUMP_BLOCK_RSV(fs_info, global_block_rsv);
@@ -634,7 +618,7 @@ static void dump_global_block_rsv(struct btrfs_fs_info *fs_info) 
static void __btrfs_dump_space_info(const struct btrfs_space_info *info)

{

	const struct btrfs_fs_info *fs_info = info->fs_info;

	const char *flag_str = space_info_flag_to_str(info);

	const char *flag_str = btrfs_space_info_type_str(info);

	lockdep_assert_held(&info->lock);



	/* The free space could be negative in case of overcommit */

fs/btrfs/space-info.h

+16 −0
Original line number Diff line number Diff line
@@ -307,4 +307,20 @@ int btrfs_calc_reclaim_threshold(const struct btrfs_space_info *space_info); 
void btrfs_reclaim_sweep(const struct btrfs_fs_info *fs_info);

void btrfs_return_free_space(struct btrfs_space_info *space_info, u64 len);



static inline const char *btrfs_space_info_type_str(const struct btrfs_space_info *space_info)

{

	switch (space_info->flags) {

	case BTRFS_BLOCK_GROUP_SYSTEM:

		return "SYSTEM";

	case BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA:

		return "DATA+METADATA";

	case BTRFS_BLOCK_GROUP_DATA:

		return "DATA";

	case BTRFS_BLOCK_GROUP_METADATA:

		return "METADATA";

	default:

		return "UNKNOWN";

	}

}



#endif /* BTRFS_SPACE_INFO_H */