Minor cleanups
David Sterba
maintainercover Minor cleanups
A few random cleanups or fixups.
David Sterba (4):
btrfs: zlib: use copy_page for full page copy
btrfs: zoned: use helper to check a power of two zone size
btrfs: convert btrfs_block_group::needs_free_space to runtime flag
btrfs: convert btrfs_block_group::seq_zone to runtime flag
fs/btrfs/block-group.c | 2 +- fs/btrfs/block-group.h | 13 ++++--------- fs/btrfs/free-space-tree.c | 10 +++++----- fs/btrfs/tests/free-space-tree-tests.c | 2 +- fs/btrfs/zlib.c | 4 ++-- fs/btrfs/zoned.c | 10 +++++----- 6 files changed, 18 insertions(+), 23 deletions(-)
Signature · 1 line
2.37.3
David Sterba
maintainerPATCH 1/4 btrfs: zlib: use copy_page for full page copy
The copy_page helper may use an optimized version for full page copy (eg. on s390 there's a special instruction for that), there's one more left to convert.
--- fs/btrfs/zlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/zlib.c +2 -2
@@ -155,8 +155,8 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping, in_page =find_get_page (mapping, start >>PAGE_SHIFT ); data_in =kmap_local_page (in_page); -memcpy (workspace->buf + i *PAGE_SIZE , - data_in,PAGE_SIZE ); +copy_page (workspace->buf + i *PAGE_SIZE , + data_in); start +=PAGE_SIZE ; } workspace->strm.next_in = workspace->buf;
Signature · 1 line
2.37.3
David Sterba
maintainerPATCH 2/4 btrfs: zoned: use helper to check a power of two zone size
In reply to David SterbaWe have a 64bit compatible helper to check if a value is a power of two, use it instead of open coding it.
--- fs/btrfs/zoned.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/btrfs/zoned.c +1 -2
@@ -393,8 +393,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) zone_sectors =bdev_zone_sectors (bdev); } -/* Check if it's power of 2 (see is_power_of_2) */ -ASSERT (zone_sectors !=0 && (zone_sectors & (zone_sectors -1 )) ==0 ); +ASSERT (is_power_of_two_u64 (zone_sectors)); zone_info->zone_size = zone_sectors <<SECTOR_SHIFT ;/* We reject devices with a zone size larger than 8GB */
Signature · 1 line
2.37.3
David Sterba
maintainerPATCH 3/4 btrfs: convert btrfs_block_group::needs_free_space to runtime flag
In reply to David SterbaWe already have flags in block group to track various status bits, convert needs_free_space as well and reduce size of btrfs_block_group.
--- fs/btrfs/block-group.c | 2 +- fs/btrfs/block-group.h | 8 ++------ fs/btrfs/free-space-tree.c | 10 +++++----- fs/btrfs/tests/free-space-tree-tests.c | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-)
fs/btrfs/block-group.c +1 -1
@@ -2553,7 +2553,7 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran cache->global_root_id =calculate_global_root_id (fs_info, cache->start);if (btrfs_fs_compat_ro (fs_info,FREE_SPACE_TREE )) - cache->needs_free_space =1 ; +set_bit (BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , &cache->runtime_flags); ret =btrfs_load_block_group_zone_info (cache, true);if (ret) {
fs/btrfs/block-group.h +2 -6
@@ -55,6 +55,8 @@ enum btrfs_block_group_flags {BLOCK_GROUP_FLAG_CHUNK_ITEM_INSERTED ,BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE ,BLOCK_GROUP_FLAG_ZONED_DATA_RELOC , +/* Does the block group need to be added to the free space tree? */ + BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE, }; enum btrfs_caching_type {
@@ -208,12 +210,6 @@ struct btrfs_block_group {/* Lock for free space tree operations. */ struct mutex free_space_lock; -/* -* Does the block group need to be added to the free space tree? -* Protected by free_space_lock. -*/ -int needs_free_space; -/* Flag indicating this block group is placed on a sequential zone */ bool seq_zone;
fs/btrfs/free-space-tree.c +5 -5
@@ -808,7 +808,7 @@ int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,u32 flags;int ret; -if (block_group->needs_free_space) { +if (test_bit (BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , &block_group->runtime_flags)) { ret =__add_block_group_free_space (trans, block_group, path);if (ret)return ret;
@@ -1001,7 +1001,7 @@ int __add_to_free_space_tree(struct btrfs_trans_handle *trans,u32 flags;int ret; -if (block_group->needs_free_space) { +if (test_bit (BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , &block_group->runtime_flags)) { ret =__add_block_group_free_space (trans, block_group, path);if (ret)return ret;
@@ -1304,7 +1304,7 @@ static int __add_block_group_free_space(struct btrfs_trans_handle *trans, {int ret; - block_group->needs_free_space =0 ; +clear_bit (BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , &block_group->runtime_flags); ret =add_new_free_space_info (trans, block_group, path);if (ret)
@@ -1326,7 +1326,7 @@ int add_block_group_free_space(struct btrfs_trans_handle *trans,return 0 ;mutex_lock (&block_group->free_space_lock); -if (!block_group->needs_free_space) +if (!test_bit (BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , &block_group->runtime_flags)) goto out; path =btrfs_alloc_path ();
@@ -1359,7 +1359,7 @@ int remove_block_group_free_space(struct btrfs_trans_handle *trans,if (!btrfs_fs_compat_ro (trans->fs_info,FREE_SPACE_TREE ))return 0 ; -if (block_group->needs_free_space) { +if (test_bit (BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , &block_group->runtime_flags)) {/* We never added this block group to the free space tree. */ return 0 ; }
fs/btrfs/tests/free-space-tree-tests.c +1 -1
@@ -471,7 +471,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize, } cache->bitmap_low_thresh =0 ; cache->bitmap_high_thresh = (u32)-1 ; - cache->needs_free_space =1 ; +set_bit (BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , &cache->runtime_flags); cache->fs_info = root->fs_info;btrfs_init_dummy_trans (&trans, root->fs_info);
Signature · 1 line
2.37.3
David Sterba
maintainerPATCH 4/4 btrfs: convert btrfs_block_group::seq_zone to runtime flag
In reply to David SterbaIn zoned mode the sequential status of zone can be also tracked in the runtime flags of block group.
--- fs/btrfs/block-group.h | 5 ++--- fs/btrfs/zoned.c | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-)
fs/btrfs/block-group.h +2 -3
@@ -57,6 +57,8 @@ enum btrfs_block_group_flags {BLOCK_GROUP_FLAG_ZONED_DATA_RELOC ,/* Does the block group need to be added to the free space tree? */ BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE , +/* Indicate that the block group is placed on a sequential zone */ + BLOCK_GROUP_FLAG_SEQUENTIAL_ZONE, }; enum btrfs_caching_type {
@@ -210,9 +212,6 @@ struct btrfs_block_group {/* Lock for free space tree operations. */ struct mutex free_space_lock; -/* Flag indicating this block group is placed on a sequential zone */ -bool seq_zone; -/* * Number of extents in this block group used for swap files. * All accesses protected by the spinlock 'lock'.
fs/btrfs/zoned.c +4 -3
@@ -1396,7 +1396,7 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new) }if (num_sequential >0 ) - cache->seq_zone = true; +set_bit (BLOCK_GROUP_FLAG_SEQUENTIAL_ZONE , &cache->runtime_flags);if (num_conventional >0 ) {/* Zone capacity is always zone size in emulation */
@@ -1608,7 +1608,7 @@ bool btrfs_use_zone_append(struct btrfs_inode *inode, u64 start)if (!cache)return false; - ret = cache->seq_zone; + ret = !!test_bit (BLOCK_GROUP_FLAG_SEQUENTIAL_ZONE , &cache->runtime_flags);btrfs_put_block_group (cache);return ret;
@@ -2113,7 +2113,8 @@ static void btrfs_zone_finish_endio_workfn(struct work_struct *work)void btrfs_schedule_zone_finish_bg (struct btrfs_block_group *bg,struct extent_buffer *eb) { -if (!bg->seq_zone || eb->start + eb->len *2 <= bg->start + bg->zone_capacity) +if (!test_bit (BLOCK_GROUP_FLAG_SEQUENTIAL_ZONE , &bg->runtime_flags) || + eb->start + eb->len *2 <= bg->start + bg->zone_capacity)return ;if (WARN_ON (bg->zone_finish_work.func == btrfs_zone_finish_endio_workfn)) {
Signature · 1 line
2.37.3
Re: [PATCH 1/4] btrfs: zlib: use copy_page for full page copy
In reply to David SterbaQuoted 5 lines · David Sterba
The
copy_pagehelper may use an optimized version for full page copy (eg. on s390 there's a special instruction for that), there's one more left to convert.Signed-off-by David Sterba <[email protected]>
Re: [PATCH 2/4] btrfs: zoned: use helper to check a power of two zone size
In reply to David SterbaQuoted 4 lines · David Sterba
We have a 64bit compatible helper to check if a value is a power of two, use it instead of open coding it.
Signed-off-by David Sterba <[email protected]>
Re: [PATCH 3/4] btrfs: convert btrfs_block_group::needs_free_space to runtime flag
In reply to David SterbaQuoted 4 lines · David Sterba
We already have flags in block group to track various status bits, convert
needs_free_spaceas well and reduce size ofbtrfs_block_group.Signed-off-by David Sterba <[email protected]>
Re: [PATCH 4/4] btrfs: convert btrfs_block_group::seq_zone to runtime flag
In reply to David SterbaQuoted 4 lines · David Sterba
In zoned mode the sequential status of zone can be also tracked in the runtime flags of block group.
Signed-off-by David Sterba <[email protected]>
Quoted 7 lines · David Sterba
A few random cleanups or fixups.
David Sterba (4):
btrfs: zlib: usecopy_pagefor full page copy
btrfs: zoned: use helper to check a power of two zone size
btrfs: convertbtrfs_block_group::needs_free_spaceto runtime flag
btrfs: convertbtrfs_block_group::seq_zoneto runtime flag
Added to msic-next.