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, 5 insertions, 5 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index e95d521d93e9..68d036e64041 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -73,12 +73,12 @@ static void multipath_reschedule_retry (struct multipath_bh *mp_bh)
  * operation and are ready to return a success/failure code to the buffer
  * cache layer.
  */
-static void multipath_end_bh_io (struct multipath_bh *mp_bh, int err)
+static void multipath_end_bh_io(struct multipath_bh *mp_bh, blk_status_t status)
 {
         struct bio *bio = mp_bh->master_bio;
         struct mpconf *conf = mp_bh->mddev->private;
 
-        bio->bi_error = err;
+        bio->bi_status = status;
         bio_endio(bio);
         mempool_free(mp_bh, conf->pool);
 }
@@ -89,7 +89,7 @@ static void multipath_end_request(struct bio *bio)
         struct mpconf *conf = mp_bh->mddev->private;
         struct md_rdev *rdev = conf->multipaths[mp_bh->path].rdev;
 
-        if (!bio->bi_error)
+        if (!bio->bi_status)
                 multipath_end_bh_io(mp_bh, 0);
         else if (!(bio->bi_opf & REQ_RAHEAD)) {
                 /*
@@ -102,7 +102,7 @@ static void multipath_end_request(struct bio *bio)
                         (unsigned long long)bio->bi_iter.bi_sector);
                 multipath_reschedule_retry(mp_bh);
         } else
-                multipath_end_bh_io(mp_bh, bio->bi_error);
+                multipath_end_bh_io(mp_bh, bio->bi_status);
         rdev_dec_pending(rdev, conf->mddev);
 }
 
@@ -347,7 +347,7 @@ static void multipathd(struct md_thread *thread)
                         pr_err("multipath: %s: unrecoverable IO read error for block %llu\n",
                                bdevname(bio->bi_bdev,b),
                                (unsigned long long)bio->bi_iter.bi_sector);
-                        multipath_end_bh_io(mp_bh, -EIO);
+                        multipath_end_bh_io(mp_bh, BLK_STS_IOERR);
                 } else {
                         pr_err("multipath: %s: redirecting sector %llu to another IO path\n",
                                bdevname(bio->bi_bdev,b),