mirror of
https://github.com/kdave/btrfs-progs
synced 2024-12-24 23:22:27 +00:00
btrfs-progs: unbreak btrfs-sb-mod compilation
Fix compiler warnings and errors in btrfs-sb-mod due to incorrect conversion with the checksum updates. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
c5a202be8f
commit
a7e2f17a84
@ -36,7 +36,7 @@ static int check_csum_superblock(void *sb)
|
||||
u8 result[BTRFS_CSUM_SIZE];
|
||||
u16 csum_type = btrfs_super_csum_type(sb);
|
||||
|
||||
btrfs_csum_data(csum_type, (char *)sb + BTRFS_CSUM_SIZE,
|
||||
btrfs_csum_data(csum_type, (unsigned char *)sb + BTRFS_CSUM_SIZE,
|
||||
result, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
|
||||
|
||||
return !memcmp(sb, result, csum_size);
|
||||
@ -48,7 +48,7 @@ static void update_block_csum(void *block)
|
||||
struct btrfs_header *hdr;
|
||||
u16 csum_type = btrfs_super_csum_type(block);
|
||||
|
||||
btrfs_csum_data(csum_type, (char *)block + BTRFS_CSUM_SIZE,
|
||||
btrfs_csum_data(csum_type, (unsigned char *)block + BTRFS_CSUM_SIZE,
|
||||
result, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
|
||||
|
||||
memset(block, 0, BTRFS_CSUM_SIZE);
|
||||
@ -283,7 +283,7 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
|
||||
/* verify superblock */
|
||||
csum_size = btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32];
|
||||
csum_size = btrfs_csum_type_size(BTRFS_CSUM_TYPE_CRC32);
|
||||
off = BTRFS_SUPER_INFO_OFFSET;
|
||||
|
||||
ret = pread(fd, buf, BLOCKSIZE, off);
|
||||
|
Loading…
Reference in New Issue
Block a user