diff options
| author | Johannes Thumshirn | 2019-05-22 10:19:01 +0200 |
|---|---|---|
| committer | David Sterba | 2019-07-01 13:35:00 +0200 |
| commit | 1e25a2e3ca0dab0ed1030570e95d98af47113eae (patch) | |
| tree | ff9d51c831b177b75d4abd939159a8341883edcb /fs/btrfs/scrub.c | |
| parent | btrfs: use btrfs_crc32c{,_final}() in for free space cache (diff) | |
| download | kernel-qcow2-linux-1e25a2e3ca0dab0ed1030570e95d98af47113eae.tar.gz kernel-qcow2-linux-1e25a2e3ca0dab0ed1030570e95d98af47113eae.tar.xz kernel-qcow2-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/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index e51929a55af4..0e77bffd2a5a 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -2448,7 +2448,7 @@ static int scrub_find_csum(struct scrub_ctx *sctx, u64 logical, u8 *csum) ASSERT(index < UINT_MAX); num_sectors = sum->len / sctx->fs_info->sectorsize; - memcpy(csum, sum->sums + index, sctx->csum_size); + memcpy(csum, sum->sums + index * sctx->csum_size, sctx->csum_size); if (index == num_sectors - 1) { list_del(&sum->list); kfree(sum); |