On Mon, Mar 09, 2020 at 02:32:37PM -0700, Omar Sandoval wrote:
> - file_offset -= dip->logical_offset;
> - file_offset >>= inode->i_sb->s_blocksize_bits;
> - csum_size = btrfs_super_csum_size(btrfs_sb(inode->i_sb)->super_copy);
> - io_bio->csum = orig_io_bio->csum + csum_size * file_offset;
> - ret = btrfs_lookup_and_bind_dio_csum(inode, dip, bio,
> - file_offset);
> - if (ret)
> - goto err;
> + u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
> + size_t csum_offset;
> +
> + csum_offset = ((file_offset - dip->logical_offset) >>
> + inode->i_sb->s_blocksize_bits) * csum_size;
Please split the expression like it used to be in the original code
(above).
> + btrfs_io_bio(bio)->csum = dip->sums + csum_offset;
> }
> map:
> ret = btrfs_map_bio(fs_info, bio, 0);
> @@ -8047,13 +8018,25 @@ static void btrfs_submit_direct(struct bio *dio_bio, struct inode *inode,
> loff_t file_offset)
> {
> struct btrfs_dio_private *dip = NULL;
> + size_t dip_size;
> struct bio *bio = NULL;
> struct btrfs_io_bio *io_bio;
> bool write = (bio_op(dio_bio) == REQ_OP_WRITE);
> + const bool csum = !(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM);
>
> bio = btrfs_bio_clone(dio_bio);
>
> - dip = kzalloc(sizeof(*dip), GFP_NOFS);
> + dip_size = sizeof(*dip);
> + if (!write && csum) {
> + struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
> + u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
> + size_t nblocks = (dio_bio->bi_iter.bi_size >>
> + inode->i_sb->s_blocksize_bits);
nblocks = dio_bio->bi_iter.bi_size >> inode->i_sb->s_blocksize_bits;
This overflows 80 chars/line but is IMHO more readable than the split
line.
