Re: [patch] blk-integrity: checking for NULL instead of IS_ERR

[Johannes Thumshirn]

On Wed, 2015-12-09 at 13:21 +0300, Dan Carpenter wrote:
> We recently changed bio_integrity_alloc() to return ERR_PTRs instead of
> NULL but these calls were missed.
> 
> Fixes: 06c1e3902aa7 ('blk-integrity: empty implementation when disabled')
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> 
> diff --git a/block/bio-integrity.c b/block/bio-integrity.c
> index e6ba501..711e4d8d 100644
> --- a/block/bio-integrity.c
> +++ b/block/bio-integrity.c
> @@ -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));
> --
> To unsubscribe from this list: send the line "unsubscribe linux-block" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info atÂÂhttp://vger.kernel.org/majordomo-info.html

Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/