tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Johannes Thumshirn and committed by
David Sterba 2ef2e97f 6a5ac228

+17 -17
+1 -17
fs/btrfs/space-info.c
··· 606 606 spin_unlock(&__rsv->lock); \ 607 607 } while (0) 608 608 609 - static const char *space_info_flag_to_str(const struct btrfs_space_info *space_info) 610 - { 611 - switch (space_info->flags) { 612 - case BTRFS_BLOCK_GROUP_SYSTEM: 613 - return "SYSTEM"; 614 - case BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA: 615 - return "DATA+METADATA"; 616 - case BTRFS_BLOCK_GROUP_DATA: 617 - return "DATA"; 618 - case BTRFS_BLOCK_GROUP_METADATA: 619 - return "METADATA"; 620 - default: 621 - return "UNKNOWN"; 622 - } 623 - } 624 - 625 609 static void dump_global_block_rsv(struct btrfs_fs_info *fs_info) 626 610 { 627 611 DUMP_BLOCK_RSV(fs_info, global_block_rsv); ··· 618 634 static void __btrfs_dump_space_info(const struct btrfs_space_info *info) 619 635 { 620 636 const struct btrfs_fs_info *fs_info = info->fs_info; 621 - const char *flag_str = space_info_flag_to_str(info); 637 + const char *flag_str = btrfs_space_info_type_str(info); 622 638 lockdep_assert_held(&info->lock); 623 639 624 640 /* The free space could be negative in case of overcommit */
+16
fs/btrfs/space-info.h
··· 307 307 void btrfs_reclaim_sweep(const struct btrfs_fs_info *fs_info); 308 308 void btrfs_return_free_space(struct btrfs_space_info *space_info, u64 len); 309 309 310 + static inline const char *btrfs_space_info_type_str(const struct btrfs_space_info *space_info) 311 + { 312 + switch (space_info->flags) { 313 + case BTRFS_BLOCK_GROUP_SYSTEM: 314 + return "SYSTEM"; 315 + case BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA: 316 + return "DATA+METADATA"; 317 + case BTRFS_BLOCK_GROUP_DATA: 318 + return "DATA"; 319 + case BTRFS_BLOCK_GROUP_METADATA: 320 + return "METADATA"; 321 + default: 322 + return "UNKNOWN"; 323 + } 324 + } 325 + 310 326 #endif /* BTRFS_SPACE_INFO_H */