c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: convert: improve error handling in create_image_file_range

Browse source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-09-06 14:07:25 +02:00
parent 030fa48b55
commit 93a34924e1
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
btrfs-convert.c
View file

@ -424,8 +424,16 @@ static int create_image_file_range(struct btrfs_trans_handle *trans,
int i;
int ret;
BUG_ON(bytenr != round_down(bytenr, root->sectorsize));
BUG_ON(len != round_down(len, root->sectorsize));
if (bytenr != round_down(bytenr, root->sectorsize)) {
error("bytenr not sectorsize aligned: %llu",
(unsigned long long)bytenr);
return -EINVAL;
}
if (len != round_down(len, root->sectorsize)) {
error("length not sectorsize aligned: %llu",
(unsigned long long)len);
return -EINVAL;
}
len = min_t(u64, len, BTRFS_MAX_EXTENT_SIZE);
/*
@ -514,7 +522,11 @@ static int create_image_file_range(struct btrfs_trans_handle *trans,
bg_cache->key.offset - bytenr);
}
BUG_ON(len != round_down(len, root->sectorsize));
if (len != round_down(len, root->sectorsize)) {
error("remaining length not sectorsize aligned: %llu",
(unsigned long long)len);
return -EINVAL;
}
ret = btrfs_record_file_extent(trans, root, ino, inode, bytenr,
disk_bytenr, len);
if (ret < 0)