Commit a4545b74 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: move BTRFS_BYTES_TO_BLKS() into fs.h 



Currently BTRFS_BYTES_TO_BLKS() is defined in ctree.h but it's not related
at all to the btree data structure, so move it into fs.h.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 22053022

fs/btrfs/ctree.h

+0 −3
Original line number Diff line number Diff line
@@ -506,9 +506,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) 
	return BTRFS_MAX_ITEM_SIZE(info) - sizeof(struct btrfs_dir_item);

}



#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \

				((bytes) >> (fs_info)->sectorsize_bits)



static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)

{

	return mapping_gfp_constraint(mapping, ~__GFP_FS);

fs/btrfs/fs.h

+2 −0
Original line number Diff line number Diff line
@@ -953,6 +953,8 @@ static inline u64 btrfs_calc_metadata_size(const struct btrfs_fs_info *fs_info, 
#define BTRFS_MAX_EXTENT_ITEM_SIZE(r) ((BTRFS_LEAF_DATA_SIZE(r->fs_info) >> 4) - \

					sizeof(struct btrfs_item))



#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) ((bytes) >> (fs_info)->sectorsize_bits)



static inline bool btrfs_is_zoned(const struct btrfs_fs_info *fs_info)

{

	return IS_ENABLED(CONFIG_BLK_DEV_ZONED) && fs_info->zone_size > 0;