block: switch bios to blk_status_t

[mirror_ubuntu-bionic-kernel.git] / drivers / nvdimm / blk.c

diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 9faaa9694d8741adb64b5aae8754f44d24a01e13..79eb9fb358d5315c677d580572866518b0c74f57 100644 (file)
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -186,7 +186,7 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)
         * another kernel subsystem, and we just pass it through.
         */
        if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
-               bio->bi_error = -EIO;
+               bio->bi_status = BLK_STS_IOERR;
                goto out;
        }
 
@@ -205,7 +205,7 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)
                                        "io error in %s sector %lld, len %d,\n",
                                        (rw == READ) ? "READ" : "WRITE",
                                        (unsigned long long) iter.bi_sector, len);
-                       bio->bi_error = err;
+                       bio->bi_status = errno_to_blk_status(err);
                        break;
                }
        }
@@ -218,7 +218,8 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)
 }
 
 static int nsblk_rw_bytes(struct nd_namespace_common *ndns,
-               resource_size_t offset, void *iobuf, size_t n, int rw)
+               resource_size_t offset, void *iobuf, size_t n, int rw,
+               unsigned long flags)
 {
        struct nd_namespace_blk *nsblk = to_nd_namespace_blk(&ndns->dev);
        struct nd_blk_region *ndbr = to_ndbr(nsblk);