diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-12-09 13:21:23 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-09 08:04:29 -0700 |
| commit | 7b6c0f8034d78390f9185e2ec2edb0a3e4ad244e (patch) | |
| tree | 18e857e72e4dcbd7969ef68d7086b3375e10e6d0 /block | |
| parent | d1ea7be5f755bf1a4d4fdccc35880fcf5069df60 (diff) | |
| download | linux-stable-7b6c0f8034d78390f9185e2ec2edb0a3e4ad244e.tar.gz linux-stable-7b6c0f8034d78390f9185e2ec2edb0a3e4ad244e.tar.bz2 linux-stable-7b6c0f8034d78390f9185e2ec2edb0a3e4ad244e.zip | |
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: 06c1e3902aa7 ('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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio-integrity.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index e6ba501eb746..711e4d8de6fa 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)); |