Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6c0f80 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Axboe
Browse files

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: 06c1e390 ('blk-integrity: empty implementation when disabled')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d1ea7be5

block/bio-integrity.c

+4 −5
Original line number Diff line number Diff line
@@ -298,10 +298,10 @@ int bio_integrity_prep(struct bio *bio) 


	/* Allocate bio integrity payload and integrity vectors */

	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");

		kfree(buf);

		return -EIO;

		return PTR_ERR(bip);

	}



	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);



	bip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt);



	if (bip == NULL)

		return -EIO;

	if (IS_ERR(bip))

		return PTR_ERR(bip);



	memcpy(bip->bip_vec, bip_src->bip_vec,

	       bip_src->bip_vcnt * sizeof(struct bio_vec));