diff options
author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-06-13 08:07:33 -0700 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-06-16 09:47:15 -0600 |
commit | a462b950834945db22f94aa98181f861eff0574d (patch) | |
tree | 400c890efdbde6621d4d27c2bdb35e6461b9908d /block | |
parent | 047385b3dd85622768a882fc457a37e040640389 (diff) | |
download | linux-a462b950834945db22f94aa98181f861eff0574d.tar.bz2 |
block: Dedicated error code fixups
This patch fixes two sparse warnings introduced by the "dedicated
error codes for the block layer V3" patch series. These changes
have not been tested.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/bio.c | 4 | ||||
-rw-r--r-- | block/t10-pi.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/bio.c b/block/bio.c index 7a5c8ed27f42..0e36ca5407b5 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1817,8 +1817,8 @@ again: } if (bio->bi_bdev && bio_flagged(bio, BIO_TRACE_COMPLETION)) { - trace_block_bio_complete(bdev_get_queue(bio->bi_bdev), - bio, bio->bi_status); + trace_block_bio_complete(bdev_get_queue(bio->bi_bdev), bio, + blk_status_to_errno(bio->bi_status)); bio_clear_flag(bio, BIO_TRACE_COMPLETION); } diff --git a/block/t10-pi.c b/block/t10-pi.c index 350b3cbcf9e5..3416dadf7b15 100644 --- a/block/t10-pi.c +++ b/block/t10-pi.c @@ -91,7 +91,7 @@ static blk_status_t t10_pi_verify(struct blk_integrity_iter *iter, "(rcvd %u)\n", iter->disk_name, (unsigned long long) iter->seed, be32_to_cpu(pi->ref_tag)); - return -EILSEQ; + return BLK_STS_PROTECTION; } break; case 3: |