diff options
| author | Johannes Thumshirn | 2019-06-03 16:58:58 +0200 |
|---|---|---|
| committer | David Sterba | 2019-07-01 13:35:02 +0200 |
| commit | ea41d6b2785f6aaeefffaaab62c3c4164b5628ce (patch) | |
| tree | 4dd68d8a651a178a5bf915289a5b2a9a189e4c82 /fs/btrfs | |
| parent | btrfs: directly call into crypto framework for checksumming (diff) | |
| download | kernel-qcow2-linux-ea41d6b2785f6aaeefffaaab62c3c4164b5628ce.tar.gz kernel-qcow2-linux-ea41d6b2785f6aaeefffaaab62c3c4164b5628ce.tar.xz kernel-qcow2-linux-ea41d6b2785f6aaeefffaaab62c3c4164b5628ce.zip | |
btrfs: remove assumption about csum type form btrfs_print_data_csum_error()
btrfs_print_data_csum_error() still assumed checksums to be 32 bit in
size. Make it size agnostic.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/btrfs_inode.h | 10 | ||||
| -rw-r--r-- | fs/btrfs/compression.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index de13be2a31a1..f853835c409c 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -342,7 +342,7 @@ static inline void btrfs_inode_resume_unlocked_dio(struct btrfs_inode *inode) #define CSUM_FMT_VALUE(size, bytes) size, bytes 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; @@ -354,16 +354,16 @@ static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode, "csum failed root %lld ino %lld off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d", root->root_key.objectid, btrfs_ino(inode), logical_start, - CSUM_FMT_VALUE(csum_size, &csum), - CSUM_FMT_VALUE(csum_size, &csum_expected), + CSUM_FMT_VALUE(csum_size, csum), + CSUM_FMT_VALUE(csum_size, csum_expected), mirror_num); else btrfs_warn_rl(root->fs_info, "csum failed root %llu ino %llu off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d", root->root_key.objectid, btrfs_ino(inode), logical_start, - CSUM_FMT_VALUE(csum_size, &csum), - CSUM_FMT_VALUE(csum_size, &csum_expected), + CSUM_FMT_VALUE(csum_size, csum), + CSUM_FMT_VALUE(csum_size, csum_expected), mirror_num); } diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 935c0c564c02..66e21a4e9ea2 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -84,8 +84,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, - cb->mirror_num); + csum, cb_sum, cb->mirror_num); ret = -EIO; goto fail; } diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3d356a0f8990..7126493d8d8c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3225,8 +3225,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); |