block: switch bios to blk_status_t

Replace bi_error with a new bi_status to allow for a clear conversion.
Note that device mapper overloaded bi_error with a private value, which
we'll have to keep arround at least for now and thus propagate to a
proper blk_status_t value.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 5384713d48bc..17b9740e138b 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -221,7 +221,7 @@ static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,
  * @bio:        bio to generate/verify integrity metadata for
  * @proc_fn:    Pointer to the relevant processing function
  */
-static int bio_integrity_process(struct bio *bio,
+static blk_status_t bio_integrity_process(struct bio *bio,
                                  integrity_processing_fn *proc_fn)
 {
         struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
@@ -229,7 +229,7 @@ static int bio_integrity_process(struct bio *bio,
         struct bvec_iter bviter;
         struct bio_vec bv;
         struct bio_integrity_payload *bip = bio_integrity(bio);
-        unsigned int ret = 0;
+        blk_status_t ret = BLK_STS_OK;
         void *prot_buf = page_address(bip->bip_vec->bv_page) +
                 bip->bip_vec->bv_offset;
 
@@ -366,7 +366,7 @@ static void bio_integrity_verify_fn(struct work_struct *work)
         struct bio *bio = bip->bip_bio;
         struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
 
-        bio->bi_error = bio_integrity_process(bio, bi->profile->verify_fn);
+        bio->bi_status = bio_integrity_process(bio, bi->profile->verify_fn);
 
         /* Restore original bio completion handler */
         bio->bi_end_io = bip->bip_end_io;
@@ -395,7 +395,7 @@ void bio_integrity_endio(struct bio *bio)
          * integrity metadata.  Restore original bio end_io handler
          * and run it.
          */
-        if (bio->bi_error) {
+        if (bio->bi_status) {
                 bio->bi_end_io = bip->bip_end_io;
                 bio_endio(bio);