Merge tag 'for-5.6-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (30fe0d07) · Commits · 戴 / test

Pull btrfs fix from David Sterba: "One fixup for DIO when in use with the new checksums, a missed case where the checksum size was still assuming u32" * tag 'for-5.6-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: fix RAID direct I/O reads with alternate csums

fs/btrfs/inode.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -7783,6 +7783,7 @@ static inline blk_status_t btrfs_lookup_and_bind_dio_csum(struct inode *inode,
		{
		struct btrfs_io_bio *io_bio = btrfs_io_bio(bio);
		struct btrfs_io_bio *orig_io_bio = btrfs_io_bio(dip->orig_bio);
		u16 csum_size;
		blk_status_t ret;

		/*
		@@ -7802,7 +7803,8 @@ static inline blk_status_t btrfs_lookup_and_bind_dio_csum(struct inode *inode,

		file_offset -= dip->logical_offset;
		file_offset >>= inode->i_sb->s_blocksize_bits;
		io_bio->csum = (u8 )(((u32 )orig_io_bio->csum) + file_offset);
		csum_size = btrfs_super_csum_size(btrfs_sb(inode->i_sb)->super_copy);
		io_bio->csum = orig_io_bio->csum + csum_size * file_offset;

		return 0;
		}

Admin message