btrfs: use shifts for sectorsize and nodesize
David Sterba
maintainerPATCH 1/1 btrfs: use shifts for sectorsize and nodesize
Convert more multiplications of sectorsize or nodesize to use the shifts. The remaining cases are multiplications by constants that compiler can optimize by itself, and in tests.
--- fs/btrfs/delalloc-space.c | 4 ++-- fs/btrfs/disk-io.c | 2 +- fs/btrfs/file-item.c | 2 +- fs/btrfs/relocation.c | 4 ++-- fs/btrfs/transaction.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
fs/btrfs/delalloc-space.c +2 -2
@@ -279,7 +279,7 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info,* * This is overestimating in most cases. */ - qgroup_rsv_size = (u64 )outstanding_extents * fs_info->nodesize; + qgroup_rsv_size = ((u64 )outstanding_extents << fs_info->nodesize_bits);spin_lock (&block_rsv->lock); block_rsv->size = reserve_size;
@@ -309,7 +309,7 @@ static void calc_inode_reservations(struct btrfs_inode *inode,* for an inode update. */ *meta_reserve += inode_update; - *qgroup_reserve = nr_extents * fs_info->nodesize; + *qgroup_reserve = (nr_extents << fs_info->nodesize_bits); } int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,
fs/btrfs/disk-io.c +1 -1
@@ -563,7 +563,7 @@ static bool btree_dirty_folio(struct address_space *mapping,continue ; }spin_unlock_irqrestore (&subpage->lock, flags); - cur = page_start + cur_bit * fs_info->sectorsize; + cur = page_start + (cur_bit << fs_info->sectorsize_bits); eb =find_extent_buffer (fs_info, cur);ASSERT (eb);
fs/btrfs/file-item.c +1 -1
@@ -1309,7 +1309,7 @@ int btrfs_insert_data_csums(struct btrfs_trans_handle *trans, index += ins_size; ins_size /= csum_size; - total_bytes += ins_size * fs_info->sectorsize; + total_bytes += (ins_size << fs_info->sectorsize_bits);if (total_bytes < sums->len) {btrfs_release_path (path);
fs/btrfs/relocation.c +2 -2
@@ -1560,7 +1560,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,* and * 2 since we have two trees to COW. */ reserve_level =max_t (int,1 ,btrfs_root_level (root_item)); - min_reserved = fs_info->nodesize * reserve_level *2 ; + min_reserved = (reserve_level << fs_info->nodesize_bits) *2 ;memset (&next_key,0 ,sizeof (next_key));while (1 ) {
@@ -2558,7 +2558,7 @@ static int relocate_cowonly_block(struct btrfs_trans_handle *trans, nr_levels =max (btrfs_header_level (root->node) - block->level,0 ) +1 ; - num_bytes = fs_info->nodesize * nr_levels; + num_bytes = (nr_levels << fs_info->nodesize_bits); ret =refill_metadata_space (trans, rc, num_bytes);if (ret) {btrfs_put_root (root);
fs/btrfs/transaction.c +1 -1
@@ -631,7 +631,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,* the appropriate flushing if need be. */ if (num_items && root != fs_info->chunk_root) { - qgroup_reserved = num_items * fs_info->nodesize; + qgroup_reserved = (num_items << fs_info->nodesize_bits);/* * Use prealloc for now, as there might be a currently running * transaction that could free this reserved space prematurely
Signature · 1 line
2.54.0
Quoted 4 lines · David Sterba
Convert more multiplications of sectorsize or nodesize to use the shifts. The remaining cases are multiplications by constants that compiler can optimize by itself, and in tests.
Quoted 62 lines
Signed-off-by David Sterba <[email protected]>--- fs/btrfs/delalloc-space.c | 4 ++-- fs/btrfs/disk-io.c | 2 +- fs/btrfs/file-item.c | 2 +- fs/btrfs/relocation.c | 4 ++-- fs/btrfs/transaction.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)fs/btrfs/delalloc-space.c +2
-2@@ -279,7 +279,7 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info,* * This is overestimating in most cases. */ - qgroup_rsv_size = (u64 )outstanding_extents * fs_info->nodesize; + qgroup_rsv_size = ((u64 )outstanding_extents << fs_info->nodesize_bits);spin_lock (&block_rsv->lock); block_rsv->size = reserve_size;@@ -309,7 +309,7 @@ static void calc_inode_reservations(struct btrfs_inode *inode,* for an inode update. */ *meta_reserve += inode_update; - *qgroup_reserve = nr_extents * fs_info->nodesize; + *qgroup_reserve = (nr_extents << fs_info->nodesize_bits); } int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,fs/btrfs/disk-io.c +1
-1@@ -563,7 +563,7 @@ static bool btree_dirty_folio(struct address_space *mapping,continue ; }spin_unlock_irqrestore (&subpage->lock, flags); - cur = page_start + cur_bit * fs_info->sectorsize; + cur = page_start + (cur_bit << fs_info->sectorsize_bits); eb =find_extent_buffer (fs_info, cur);ASSERT (eb);fs/btrfs/file-item.c +1
-1@@ -1309,7 +1309,7 @@ int btrfs_insert_data_csums(struct btrfs_trans_handle *trans, index += ins_size; ins_size /= csum_size; - total_bytes += ins_size * fs_info->sectorsize; + total_bytes += (ins_size << fs_info->sectorsize_bits);if (total_bytes < sums->len) {btrfs_release_path (path);fs/btrfs/relocation.c +0
-0
fs/btrfs/relocation.c static noinline_for_stack int merge_reloc_root(struct reloc_control *rc, · line 1563
Quoted 5 lines
fs/btrfs/relocation.c +1
-1@@ -1560,7 +1560,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,* and * 2 since we have two trees to COW. */ reserve_level =max_t (int,1 ,btrfs_root_level (root_item)); - min_reserved = fs_info->nodesize * reserve_level *2 ; + min_reserved = (reserve_level << fs_info->nodesize_bits) *2 ;
Is it nicer to just add 1 to the shift operand?
Quoted 28 lines
fs/btrfs/relocation.c +1
-1memset (&next_key,0 ,sizeof (next_key));while (1 ) {@@ -2558,7 +2558,7 @@ static int relocate_cowonly_block(struct btrfs_trans_handle *trans, nr_levels =max (btrfs_header_level (root->node) - block->level,0 ) +1 ; - num_bytes = fs_info->nodesize * nr_levels; + num_bytes = (nr_levels << fs_info->nodesize_bits); ret =refill_metadata_space (trans, rc, num_bytes);if (ret) {btrfs_put_root (root);fs/btrfs/transaction.c +1
-1@@ -631,7 +631,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,* the appropriate flushing if need be. */ if (num_items && root != fs_info->chunk_root) { - qgroup_reserved = num_items * fs_info->nodesize; + qgroup_reserved = (num_items << fs_info->nodesize_bits);/* * Use prealloc for now, as there might be a currently running * transaction that could free this reserved space prematurely Signature · 1 line
2.54.0
Quoted 10 lines · Boris Burkov
fs/btrfs/relocation.c static noinline_for_stack int merge_reloc_root(struct reloc_control *rc, · line 1563
Quoted 8 lines
fs/btrfs/relocation.c +1
-1@@ -1560,7 +1560,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,* and * 2 since we have two trees to COW. */ reserve_level =max_t (int,1 ,btrfs_root_level (root_item)); - min_reserved = fs_info->nodesize * reserve_level *2 ; + min_reserved = (reserve_level << fs_info->nodesize_bits) *2 ;Is it nicer to just add 1 to the shift operand?
There's fragment of the comment in the diff context, in full
/*
* In merge_reloc_root(), we modify the upper level pointer to swap the
* tree blocks between reloc tree and subvolume tree. Thus for tree
* block COW, we COW at most from level 1 to root level for each tree. *
* Thus the needed metadata size is at most root_level * nodesize,
* and * 2 since we have two trees to COW.
*/
so the "* 2" matches it.
Quoted 5 lines · David Sterba
Convert more multiplications of sectorsize or nodesize to use the shifts. The remaining cases are multiplications by constants that compiler can optimize by itself, and in tests.
Signed-off-by David Sterba <[email protected]>
Thanks,
Qu
Quoted 91 lines
--- fs/btrfs/delalloc-space.c | 4 ++-- fs/btrfs/disk-io.c | 2 +- fs/btrfs/file-item.c | 2 +- fs/btrfs/relocation.c | 4 ++-- fs/btrfs/transaction.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)fs/btrfs/delalloc-space.c +2
-2@@ -279,7 +279,7 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info,* * This is overestimating in most cases. */ - qgroup_rsv_size = (u64 )outstanding_extents * fs_info->nodesize; + qgroup_rsv_size = ((u64 )outstanding_extents << fs_info->nodesize_bits);spin_lock (&block_rsv->lock); block_rsv->size = reserve_size;@@ -309,7 +309,7 @@ static void calc_inode_reservations(struct btrfs_inode *inode,* for an inode update. */ *meta_reserve += inode_update; - *qgroup_reserve = nr_extents * fs_info->nodesize; + *qgroup_reserve = (nr_extents << fs_info->nodesize_bits); } int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,fs/btrfs/disk-io.c +1
-1@@ -563,7 +563,7 @@ static bool btree_dirty_folio(struct address_space *mapping,continue ; }spin_unlock_irqrestore (&subpage->lock, flags); - cur = page_start + cur_bit * fs_info->sectorsize; + cur = page_start + (cur_bit << fs_info->sectorsize_bits); eb =find_extent_buffer (fs_info, cur);ASSERT (eb);fs/btrfs/file-item.c +1
-1@@ -1309,7 +1309,7 @@ int btrfs_insert_data_csums(struct btrfs_trans_handle *trans, index += ins_size; ins_size /= csum_size; - total_bytes += ins_size * fs_info->sectorsize; + total_bytes += (ins_size << fs_info->sectorsize_bits);if (total_bytes < sums->len) {btrfs_release_path (path);fs/btrfs/relocation.c +2
-2@@ -1560,7 +1560,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,* and * 2 since we have two trees to COW. */ reserve_level =max_t (int,1 ,btrfs_root_level (root_item)); - min_reserved = fs_info->nodesize * reserve_level *2 ; + min_reserved = (reserve_level << fs_info->nodesize_bits) *2 ;memset (&next_key,0 ,sizeof (next_key));while (1 ) {@@ -2558,7 +2558,7 @@ static int relocate_cowonly_block(struct btrfs_trans_handle *trans, nr_levels =max (btrfs_header_level (root->node) - block->level,0 ) +1 ; - num_bytes = fs_info->nodesize * nr_levels; + num_bytes = (nr_levels << fs_info->nodesize_bits); ret =refill_metadata_space (trans, rc, num_bytes);if (ret) {btrfs_put_root (root);fs/btrfs/transaction.c +1
-1@@ -631,7 +631,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,* the appropriate flushing if need be. */ if (num_items && root != fs_info->chunk_root) { - qgroup_reserved = num_items * fs_info->nodesize; + qgroup_reserved = (num_items << fs_info->nodesize_bits);/* * Use prealloc for now, as there might be a currently running * transaction that could free this reserved space prematurely