|
@@ -1687,11 +1687,8 @@ int raid56_parity_write(struct btrfs_root *root, struct bio *bio,
|
|
|
struct blk_plug_cb *cb;
|
|
|
|
|
|
rbio = alloc_rbio(root, bbio, raid_map, stripe_len);
|
|
|
- if (IS_ERR(rbio)) {
|
|
|
- kfree(raid_map);
|
|
|
- kfree(bbio);
|
|
|
+ if (IS_ERR(rbio))
|
|
|
return PTR_ERR(rbio);
|
|
|
- }
|
|
|
bio_list_add(&rbio->bio_list, bio);
|
|
|
rbio->bio_list_bytes = bio->bi_size;
|
|
|
|
|
@@ -2041,9 +2038,8 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio,
|
|
|
int ret;
|
|
|
|
|
|
rbio = alloc_rbio(root, bbio, raid_map, stripe_len);
|
|
|
- if (IS_ERR(rbio)) {
|
|
|
+ if (IS_ERR(rbio))
|
|
|
return PTR_ERR(rbio);
|
|
|
- }
|
|
|
|
|
|
rbio->read_rebuild = 1;
|
|
|
bio_list_add(&rbio->bio_list, bio);
|
|
@@ -2052,6 +2048,8 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio,
|
|
|
rbio->faila = find_logical_bio_stripe(rbio, bio);
|
|
|
if (rbio->faila == -1) {
|
|
|
BUG();
|
|
|
+ kfree(raid_map);
|
|
|
+ kfree(bbio);
|
|
|
kfree(rbio);
|
|
|
return -EIO;
|
|
|
}
|