Commit 265fdfa6 authored by David Sterba's avatar David Sterba
Browse files

btrfs: replace s_blocksize_bits with fs_info::sectorsize_bits 



The value of super_block::s_blocksize_bits is the same as
fs_info::sectorsize_bits, but we don't need to do the extra dereferences
in many functions and storing the bits as u32 (in fs_info) generates
shorter assembly.

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

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ struct btrfs_map_token { 
};



#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \

				((bytes) >> (fs_info)->sb->s_blocksize_bits)

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



static inline void btrfs_init_map_token(struct btrfs_map_token *token,

					struct extent_buffer *eb)

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -2656,7 +2656,7 @@ blk_status_t btrfs_submit_read_repair(struct inode *inode, 
	struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;

	struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree;

	struct btrfs_io_bio *failed_io_bio = btrfs_io_bio(failed_bio);

	const int icsum = phy_offset >> inode->i_sb->s_blocksize_bits;

	const int icsum = phy_offset >> fs_info->sectorsize_bits;

	bool need_validation;

	struct bio *repair_bio;

	struct btrfs_io_bio *repair_io_bio;

fs/btrfs/file-item.c

+15 −19
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ btrfs_lookup_csum(struct btrfs_trans_handle *trans, 
			goto fail;



		csum_offset = (bytenr - found_key.offset) >>

				fs_info->sb->s_blocksize_bits;

				fs_info->sectorsize_bits;

		csums_in_item = btrfs_item_size_nr(leaf, path->slots[0]);

		csums_in_item /= csum_size;
@@ -279,7 +279,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, 
	if (!path)

		return BLK_STS_RESOURCE;



	nblocks = bio->bi_iter.bi_size >> inode->i_sb->s_blocksize_bits;

	nblocks = bio->bi_iter.bi_size >> fs_info->sectorsize_bits;

	if (!dst) {

		struct btrfs_io_bio *btrfs_bio = btrfs_io_bio(bio);
@@ -372,7 +372,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, 
		diff = diff >> fs_info->sectorsize_bits;

		diff = diff * csum_size;

		count = min_t(int, nblocks, (item_last_offset - disk_bytenr) >>

					    inode->i_sb->s_blocksize_bits);

					    fs_info->sectorsize_bits);

		read_extent_buffer(path->nodes[0], csum,

				   ((unsigned long)item) + diff,

				   csum_size * count);
@@ -436,8 +436,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, 
		btrfs_item_key_to_cpu(leaf, &key, path->slots[0] - 1);

		if (key.objectid == BTRFS_EXTENT_CSUM_OBJECTID &&

		    key.type == BTRFS_EXTENT_CSUM_KEY) {

			offset = (start - key.offset) >>

				 fs_info->sb->s_blocksize_bits;

			offset = (start - key.offset) >> fs_info->sectorsize_bits;

			if (offset * csum_size <

			    btrfs_item_size_nr(leaf, path->slots[0] - 1))

				path->slots[0]--;
@@ -487,10 +486,9 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, 
			sums->bytenr = start;

			sums->len = (int)size;



			offset = (start - key.offset) >>

				fs_info->sb->s_blocksize_bits;

			offset = (start - key.offset) >> fs_info->sectorsize_bits;

			offset *= csum_size;

			size >>= fs_info->sb->s_blocksize_bits;

			size >>= fs_info->sectorsize_bits;



			read_extent_buffer(path->nodes[0],

					   sums->sums,
@@ -643,11 +641,11 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info, 
	u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

	u64 csum_end;

	u64 end_byte = bytenr + len;

	u32 blocksize_bits = fs_info->sb->s_blocksize_bits;

	u32 blocksize_bits = fs_info->sectorsize_bits;



	leaf = path->nodes[0];

	csum_end = btrfs_item_size_nr(leaf, path->slots[0]) / csum_size;

	csum_end <<= fs_info->sb->s_blocksize_bits;

	csum_end <<= blocksize_bits;

	csum_end += key->offset;



	if (key->offset < bytenr && csum_end <= end_byte) {
@@ -695,7 +693,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans, 
	struct extent_buffer *leaf;

	int ret;

	u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

	int blocksize_bits = fs_info->sb->s_blocksize_bits;

	u32 blocksize_bits = fs_info->sectorsize_bits;



	ASSERT(root == fs_info->csum_root ||

	       root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID);
@@ -924,7 +922,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, 
	if (btrfs_leaf_free_space(leaf) >= csum_size) {

		btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);

		csum_offset = (bytenr - found_key.offset) >>

			fs_info->sb->s_blocksize_bits;

			fs_info->sectorsize_bits;

		goto extend_csum;

	}
@@ -942,8 +940,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, 


	leaf = path->nodes[0];

	btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);

	csum_offset = (bytenr - found_key.offset) >>

			fs_info->sb->s_blocksize_bits;

	csum_offset = (bytenr - found_key.offset) >> fs_info->sectorsize_bits;



	if (found_key.type != BTRFS_EXTENT_CSUM_KEY ||

	    found_key.objectid != BTRFS_EXTENT_CSUM_OBJECTID ||
@@ -959,7 +956,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, 
		u32 diff;



		tmp = sums->len - total_bytes;

		tmp >>= fs_info->sb->s_blocksize_bits;

		tmp >>= fs_info->sectorsize_bits;

		WARN_ON(tmp < 1);



		extend_nr = max_t(int, 1, (int)tmp);
@@ -984,9 +981,9 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, 
		u64 tmp;



		tmp = sums->len - total_bytes;

		tmp >>= fs_info->sb->s_blocksize_bits;

		tmp >>= fs_info->sectorsize_bits;

		tmp = min(tmp, (next_offset - file_key.offset) >>

					 fs_info->sb->s_blocksize_bits);

					 fs_info->sectorsize_bits);



		tmp = max_t(u64, 1, tmp);

		tmp = min_t(u64, tmp, MAX_CSUM_ITEMS(fs_info, csum_size));
@@ -1010,8 +1007,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, 
	item = (struct btrfs_csum_item *)((unsigned char *)item +

					  csum_offset * csum_size);

found:

	ins_size = (u32)(sums->len - total_bytes) >>

		   fs_info->sb->s_blocksize_bits;

	ins_size = (u32)(sums->len - total_bytes) >> fs_info->sectorsize_bits;

	ins_size *= csum_size;

	ins_size = min_t(u32, (unsigned long)item_end - (unsigned long)item,

			      ins_size);

fs/btrfs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -1799,8 +1799,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, 


		if (num_sectors > dirty_sectors) {

			/* release everything except the sectors we dirtied */

			release_bytes -= dirty_sectors <<

						fs_info->sb->s_blocksize_bits;

			release_bytes -= dirty_sectors << fs_info->sectorsize_bits;

			if (only_release_metadata) {

				btrfs_delalloc_release_metadata(BTRFS_I(inode),

							release_bytes, true);

fs/btrfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -2966,7 +2966,7 @@ int btrfs_verify_data_csum(struct btrfs_io_bio *io_bio, u64 phy_offset, 
		return 0;

	}



	phy_offset >>= inode->i_sb->s_blocksize_bits;

	phy_offset >>= root->fs_info->sectorsize_bits;

	return check_data_csum(inode, io_bio, phy_offset, page, offset);

}
@@ -7824,7 +7824,7 @@ static inline blk_status_t btrfs_submit_dio_bio(struct bio *bio, 
		u64 csum_offset;



		csum_offset = file_offset - dip->logical_offset;

		csum_offset >>= inode->i_sb->s_blocksize_bits;

		csum_offset >>= fs_info->sectorsize_bits;

		csum_offset *= btrfs_super_csum_size(fs_info->super_copy);

		btrfs_io_bio(bio)->csum = dip->csums + csum_offset;

	}
@@ -7853,7 +7853,7 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio, 
		const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

		size_t nblocks;



		nblocks = dio_bio->bi_iter.bi_size >> inode->i_sb->s_blocksize_bits;

		nblocks = dio_bio->bi_iter.bi_size >> fs_info->sectorsize_bits;

		dip_size += csum_size * nblocks;

	}