diff options
| author | David Sterba <dsterba@suse.com> | 2020-07-01 21:19:09 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-12-08 15:53:58 +0100 |
| commit | 265fdfa6ce0a79df3b880bbf39d9a00a0435687f (patch) | |
| tree | d17cb9236e996f9f149bde5ac146f11016239538 /fs/btrfs/inode.c | |
| parent | 098e63082b9bd26b61a57310385efc3e9f363dea (diff) | |
| download | lwn-265fdfa6ce0a79df3b880bbf39d9a00a0435687f.tar.gz lwn-265fdfa6ce0a79df3b880bbf39d9a00a0435687f.zip | |
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: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8c77b1d32d8e..0b0c751dac85 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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; } |