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: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 3f08e450f7961eece0634fa06b898dd9b49f1d0b..857e4fd2c77e0cdb71706b953a1b7a4f45d49ef6 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -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 */

diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index 446c0614ad4aba4e165004fe3e96dfdf3fe69cc7..0703f24b23f70d6be7a4b374a119c23160d4dfdd 100644 (file)
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -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 */