diff options
| author | Johannes Thumshirn <jthumshirn@suse.de> | 2019-05-22 10:19:01 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-07-01 13:35:00 +0200 |
| commit | 1e25a2e3ca0dab0ed1030570e95d98af47113eae (patch) | |
| tree | ff9d51c831b177b75d4abd939159a8341883edcb /fs/btrfs/ctree.h | |
| parent | 4bb3c2e2b5bb0d57f7d11f2da829357c5ca628a4 (diff) | |
| download | linux-1e25a2e3ca0dab0ed1030570e95d98af47113eae.tar.gz linux-1e25a2e3ca0dab0ed1030570e95d98af47113eae.tar.bz2 linux-1e25a2e3ca0dab0ed1030570e95d98af47113eae.zip | |
btrfs: don't assume ordered sums to be 4 bytes
BTRFS has the implicit assumption that a checksum in btrfs_orderd_sums
is 4 bytes. While this is true for CRC32C, it is not for any other
checksum.
Change the data type to be a byte array and adjust loop index
calculation accordingly.
This includes moving the adjustment of 'index' by 'ins_size' in
btrfs_csum_file_blocks() before dividing 'ins_size' by the checksum
size, because before this patch the 'sums' member of 'struct
btrfs_ordered_sum' was 4 Bytes in size and afterwards it is only one
byte.
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/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 3691cd177ead..a66ed58058d9 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3199,7 +3199,8 @@ int btrfs_find_name_in_ext_backref(struct extent_buffer *leaf, int slot, struct btrfs_dio_private; int btrfs_del_csums(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, u64 bytenr, u64 len); -blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u32 *dst); +blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, + u8 *dst); blk_status_t btrfs_lookup_bio_sums_dio(struct inode *inode, struct bio *bio, u64 logical_offset); int btrfs_insert_file_extent(struct btrfs_trans_handle *trans, |