btrfs: switch cached fs_info::csum_size from u16 to u32

The fs_info value is 32bit, switch also the local u16 variables. This
leads to a better assembly code generated due to movzwl.

This simple change will shave some bytes on x86_64 and release config:

   text    data     bss     dec     hex filename
1090000   17980   14912 1122892  11224c pre/btrfs.ko
1089794   17980   14912 1122686  11217e post/btrfs.ko

DELTA: -206

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index a31b7e32dd60535b15bb6d06c6dc7fbfccf9f262..8494f62f8aa404e5a48194da816530aef1f8c34d 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -331,7 +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;
-       const u16 csum_size = root->fs_info->csum_size;
+       const u32 csum_size = root->fs_info->csum_size;
 
        /* Output minus objectid, which is more meaningful */
        if (root->root_key.objectid >= BTRFS_LAST_FREE_OBJECTID)

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 00bbd859f31b7444499a2fb4390967a4cba48677..b2bb4681975ee7ea8123aa36fda48274f2d8f4b7 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -131,8 +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)
 {
-       const u16 csum_size = fs_info->csum_size;
-
+       const u32 csum_size = fs_info->csum_size;
        return sizeof(struct compressed_bio) +
                (DIV_ROUND_UP(disk_size, fs_info->sectorsize)) * csum_size;
 }
@@ -142,7 +141,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 = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        struct page *page;
        unsigned long i;
        char *kaddr;
@@ -628,7 +627,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 = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        u8 *sums;
 
        em_tree = &BTRFS_I(inode)->extent_tree;

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 95ebe7c84dd75883e8546fb188f8a82406d83c2a..02b36908327a5e8ef244f5d6bbb504b5792029ca 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -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];
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        struct extent_buffer *eb;
        int ret;
 

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index d699f5d9b71049fa132d82d2381e829b1c8dc3ca..f3515d3c132198da8f087592edd9d4a517802e3f 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -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 = fs_info->csum_size;
+               const u32 csum_size = fs_info->csum_size;
 
                repair_io_bio->csum = repair_io_bio->csum_inline;
                memcpy(repair_io_bio->csum,

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 90e673847b47961857b21fc59cae807e64781e22..73ec6c5eadcb6b25c2a5cb2432956179be10478f 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -181,7 +181,7 @@ btrfs_lookup_csum(struct btrfs_trans_handle *trans,
        struct btrfs_csum_item *item;
        struct extent_buffer *leaf;
        u64 csum_offset = 0;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        int csums_in_item;
 
        file_key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
@@ -270,7 +270,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio,
        u32 diff;
        int nblocks;
        int count = 0;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
 
        if (!fs_info->csum_root || (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM))
                return BLK_STS_OK;
@@ -409,7 +409,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
        int ret;
        size_t size;
        u64 csum_end;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
 
        ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&
               IS_ALIGNED(end + 1, fs_info->sectorsize));
@@ -540,7 +540,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio,
        int i;
        u64 offset;
        unsigned nofs_flag;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
 
        nofs_flag = memalloc_nofs_save();
        sums = kvzalloc(btrfs_ordered_sum_size(fs_info, bio->bi_iter.bi_size),
@@ -638,7 +638,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info,
                                       u64 bytenr, u64 len)
 {
        struct extent_buffer *leaf;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        u64 csum_end;
        u64 end_byte = bytenr + len;
        u32 blocksize_bits = fs_info->sectorsize_bits;
@@ -692,7 +692,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
        u64 csum_end;
        struct extent_buffer *leaf;
        int ret;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        u32 blocksize_bits = fs_info->sectorsize_bits;
 
        ASSERT(root == fs_info->csum_root ||
@@ -847,7 +847,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
        int index = 0;
        int found_next;
        int ret;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
 
        path = btrfs_alloc_path();
        if (!path)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 358d900d0cf53dc0fffcf1e0d052b71cbdaf4a12..d1915049d7e78a813ec154a8c5e3864fd3c91b0b 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2906,7 +2906,7 @@ static int check_data_csum(struct inode *inode, struct btrfs_io_bio *io_bio,
        SHASH_DESC_ON_STACK(shash, fs_info->csum_shash);
        char *kaddr;
        u32 len = fs_info->sectorsize;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        u8 *csum_expected;
        u8 csum[BTRFS_CSUM_SIZE];
 
@@ -7850,11 +7850,10 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio,
        dip_size = sizeof(*dip);
        if (!write && csum) {
                struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
-               const u16 csum_size = fs_info->csum_size;
                size_t nblocks;
 
                nblocks = dio_bio->bi_iter.bi_size >> fs_info->sectorsize_bits;
-               dip_size += csum_size * nblocks;
+               dip_size += fs_info->csum_size * nblocks;
        }
 
        dip = kzalloc(dip_size, GFP_NOFS);

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 6a63fb141f2332d5edcfb13c43087d32513fb711..0d61f9fefc0252f7e894498097368ac25928ecb8 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -868,7 +868,7 @@ int btrfs_find_ordered_sum(struct btrfs_inode *inode, u64 offset,
        struct btrfs_ordered_inode_tree *tree = &inode->ordered_tree;
        unsigned long num_sectors;
        unsigned long i;
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
        int index = 0;
 
        ordered = btrfs_lookup_ordered_extent(inode, offset);

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 4662fd8ca54648f047a97c8103bee80043bcc016..e48810104e4af892161462f1ba4fcf5adef7761d 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -137,7 +137,7 @@ static inline int btrfs_ordered_sum_size(struct btrfs_fs_info *fs_info,
                                         unsigned long bytes)
 {
        int num_sectors = (int)DIV_ROUND_UP(bytes, fs_info->sectorsize);
-       const u16 csum_size = fs_info->csum_size;
+       const u32 csum_size = fs_info->csum_size;
 
        return sizeof(struct btrfs_ordered_sum) + num_sectors * csum_size;
 }

diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index 1fe5961a9f60b492894c2f166cff4eb1467f08ea..f3f666b343ef7b24ca7151ccb1dc2893227ae5ad 100644 (file)
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -336,7 +336,7 @@ static int check_csum_item(struct extent_buffer *leaf, struct btrfs_key *key,
 {
        struct btrfs_fs_info *fs_info = leaf->fs_info;
        u32 sectorsize = fs_info->sectorsize;
-       const u16 csumsize = fs_info->csum_size;
+       const u32 csumsize = fs_info->csum_size;
 
        if (key->objectid != BTRFS_EXTENT_CSUM_OBJECTID) {
                generic_err(leaf, slot,