Commit 55fc29be authored by David Sterba's avatar David Sterba
Browse files

btrfs: use cached value of fs_info::csum_size everywhere 



btrfs_get_16 shows up in the system performance profiles (helper to read
16bit values from on-disk structures). This is partially because of the
checksum size that's frequently read along with data reads/writes, other
u16 uses are from item size or directory entries.

Replace all calls to btrfs_super_csum_size by the cached value from
fs_info.

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 fe5ecbe8

fs/btrfs/btrfs_inode.h

+1 −2
Original line number Diff line number Diff line
@@ -331,8 +331,7 @@ static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode, 
		u64 logical_start, u8 *csum, u8 *csum_expected, int mirror_num)

{

	struct btrfs_root *root = inode->root;

	struct btrfs_super_block *sb = root->fs_info->super_copy;

	const u16 csum_size = btrfs_super_csum_size(sb);

	const u16 csum_size = root->fs_info->csum_size;



	/* Output minus objectid, which is more meaningful */

	if (root->root_key.objectid >= BTRFS_LAST_FREE_OBJECTID)

fs/btrfs/check-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state, 
		return -1;

	}



	state->csum_size = btrfs_super_csum_size(selected_super);

	state->csum_size = state->fs_info->csum_size;



	for (pass = 0; pass < 3; pass++) {

		int num_copies;

fs/btrfs/compression.c

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int btrfs_decompress_bio(struct compressed_bio *cb); 
static inline int compressed_bio_size(struct btrfs_fs_info *fs_info,

				      unsigned long disk_size)

{

	u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

	const u16 csum_size = fs_info->csum_size;



	return sizeof(struct compressed_bio) +

		(DIV_ROUND_UP(disk_size, fs_info->sectorsize)) * csum_size;
@@ -142,7 +142,7 @@ static int check_compressed_csum(struct btrfs_inode *inode, struct bio *bio, 
{

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	SHASH_DESC_ON_STACK(shash, fs_info->csum_shash);

	const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

	const u16 csum_size = fs_info->csum_size;

	struct page *page;

	unsigned long i;

	char *kaddr;
@@ -628,7 +628,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	struct extent_map *em;

	blk_status_t ret = BLK_STS_RESOURCE;

	int faili = 0;

	const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

	const u16 csum_size = fs_info->csum_size;

	u8 *sums;



	em_tree = &BTRFS_I(inode)->extent_tree;

fs/btrfs/disk-io.c

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, 
	crypto_shash_digest(shash, raw_disk_sb + BTRFS_CSUM_SIZE,

			    BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE, result);



	if (memcmp(disk_sb->csum, result, btrfs_super_csum_size(disk_sb)))

	if (memcmp(disk_sb->csum, result, fs_info->csum_size))

		return 1;



	return 0;
@@ -454,7 +454,7 @@ static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct page *page) 
	u64 start = page_offset(page);

	u64 found_start;

	u8 result[BTRFS_CSUM_SIZE];

	u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

	const u16 csum_size = fs_info->csum_size;

	struct extent_buffer *eb;

	int ret;
@@ -543,7 +543,7 @@ int btrfs_validate_metadata_buffer(struct btrfs_io_bio *io_bio, u64 phy_offset, 


	eb = (struct extent_buffer *)page->private;

	fs_info = eb->fs_info;

	csum_size = btrfs_super_csum_size(fs_info->super_copy);

	csum_size = fs_info->csum_size;



	/* the pending IO might have been the only thing that kept this buffer

	 * in memory.  Make sure we have a ref for all this other checks

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -2689,7 +2689,7 @@ blk_status_t btrfs_submit_read_repair(struct inode *inode, 
	repair_bio->bi_private = failed_bio->bi_private;



	if (failed_io_bio->csum) {

		const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

		const u16 csum_size = fs_info->csum_size;



		repair_io_bio->csum = repair_io_bio->csum_inline;

		memcpy(repair_io_bio->csum,