From: Johannes Thumshirn <jthumshirn@suse.de>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Jens Axboe <axboe@kernel.dk>, Keith Busch <keith.busch@intel.com>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [patch] blk-integrity: checking for NULL instead of IS_ERR
Date: Wed, 09 Dec 2015 10:26:27 +0000 [thread overview]
Message-ID: <1449656787.3311.25.camel@suse.de> (raw)
In-Reply-To: <20151209102123.GA3173@mwanda>
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@oracle.com>
>
> 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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Thumshirn <jthumshirn@suse.de>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Jens Axboe <axboe@kernel.dk>, Keith Busch <keith.busch@intel.com>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [patch] blk-integrity: checking for NULL instead of IS_ERR
Date: Wed, 09 Dec 2015 11:26:27 +0100 [thread overview]
Message-ID: <1449656787.3311.25.camel@suse.de> (raw)
In-Reply-To: <20151209102123.GA3173@mwanda>
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@oracle.com>
>
> 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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
next prev parent reply other threads:[~2015-12-09 10:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 10:21 [patch] blk-integrity: checking for NULL instead of IS_ERR Dan Carpenter
2015-12-09 10:21 ` Dan Carpenter
2015-12-09 10:26 ` Johannes Thumshirn [this message]
2015-12-09 10:26 ` Johannes Thumshirn
2015-12-09 15:04 ` Jens Axboe
2015-12-09 15:04 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449656787.3311.25.camel@suse.de \
--to=jthumshirn@suse.de \
--cc=axboe@kernel.dk \
--cc=dan.carpenter@oracle.com \
--cc=keith.busch@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.