blk-integrity: checking for NULL instead of IS_ERR
We recently changed bio_integrity_alloc() to return ERR_PTRs instead of
NULL but these calls were missed.
Fixes: 06c1e3902a
('blk-integrity: empty implementation when disabled')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Родитель
d1ea7be5f7
Коммит
7b6c0f8034
|
@ -298,10 +298,10 @@ int bio_integrity_prep(struct bio *bio)
|
||||||
|
|
||||||
/* Allocate bio integrity payload and integrity vectors */
|
/* Allocate bio integrity payload and integrity vectors */
|
||||||
bip = bio_integrity_alloc(bio, GFP_NOIO, nr_pages);
|
bip = bio_integrity_alloc(bio, GFP_NOIO, nr_pages);
|
||||||
if (unlikely(bip == NULL)) {
|
if (IS_ERR(bip)) {
|
||||||
printk(KERN_ERR "could not allocate data integrity bioset\n");
|
printk(KERN_ERR "could not allocate data integrity bioset\n");
|
||||||
kfree(buf);
|
kfree(buf);
|
||||||
return -EIO;
|
return PTR_ERR(bip);
|
||||||
}
|
}
|
||||||
|
|
||||||
bip->bip_flags |= BIP_BLOCK_INTEGRITY;
|
bip->bip_flags |= BIP_BLOCK_INTEGRITY;
|
||||||
|
@ -465,9 +465,8 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
|
||||||
BUG_ON(bip_src == NULL);
|
BUG_ON(bip_src == NULL);
|
||||||
|
|
||||||
bip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt);
|
bip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt);
|
||||||
|
if (IS_ERR(bip))
|
||||||
if (bip == NULL)
|
return PTR_ERR(bip);
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
memcpy(bip->bip_vec, bip_src->bip_vec,
|
memcpy(bip->bip_vec, bip_src->bip_vec,
|
||||||
bip_src->bip_vcnt * sizeof(struct bio_vec));
|
bip_src->bip_vcnt * sizeof(struct bio_vec));
|
||||||
|
|
Загрузка…
Ссылка в новой задаче