On 16.05.19 г. 11:48 ч., Johannes Thumshirn wrote:
> btrfs_print_data_csum_error() still assumed checksums to be 32 bit in size.
>
> Make it size agnostic.
>
> Signed-off-by: Johannes Thumshirn <jthumsh...@suse.de>
Reviewed-by: Nikolay Borisov <nbori...@suse.com>
> ---
> fs/btrfs/btrfs_inode.h | 6 +++---
> fs/btrfs/compression.c | 2 +-
> fs/btrfs/inode.c | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
> index f0a757eb5744..e79fd9129075 100644
> --- a/fs/btrfs/btrfs_inode.h
> +++ b/fs/btrfs/btrfs_inode.h
> @@ -338,13 +338,13 @@ static inline void
> btrfs_inode_resume_unlocked_dio(struct btrfs_inode *inode)
> }
>
> static inline void btrfs_csum_format(struct btrfs_super_block *sb,
> - u32 csum, u8 *cbuf)
> + u8 *csum, u8 *cbuf)
> {
> size_t size = btrfs_super_csum_size(sb) * 8;
>
> switch (btrfs_super_csum_type(sb)) {
> case BTRFS_CSUM_TYPE_CRC32:
> - snprintf(cbuf, size, "0x%08x", csum);
> + snprintf(cbuf, size, "0x%08x", *(u32 *)csum);
> break;
> default: /* can't happen - csum type is validated at mount time */
> break;
> @@ -352,7 +352,7 @@ static inline void btrfs_csum_format(struct
> btrfs_super_block *sb,
> }
>
> static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,
> - u64 logical_start, u32 csum, u32 csum_expected, int mirror_num)
> + 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;
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index e027e58358be..358a85d77108 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -86,7 +86,7 @@ static int check_compressed_csum(struct btrfs_inode *inode,
>
> if (memcmp(&csum, cb_sum, csum_size)) {
> btrfs_print_data_csum_error(inode, disk_start,
> - *(u32 *)csum, *(u32
> *)cb_sum,
> + csum, cb_sum,
> cb->mirror_num);
> ret = -EIO;
> goto fail;
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 402c9ea8239d..af27dddcb05f 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -3226,8 +3226,8 @@ static int __readpage_endio_check(struct inode *inode,
> kunmap_atomic(kaddr);
> return 0;
> zeroit:
> - btrfs_print_data_csum_error(BTRFS_I(inode), start, *(u32 *)csum,
> - *(u32 *)csum_expected, io_bio->mirror_num);
> + btrfs_print_data_csum_error(BTRFS_I(inode), start, csum, csum_expected,
> + io_bio->mirror_num);
> memset(kaddr + pgoff, 1, len);
> flush_dcache_page(page);
> kunmap_atomic(kaddr);
>
