aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/btt.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-06-03 03:38:06 -0400
committerJens Axboe <axboe@fb.com>2017-06-09 11:27:32 -0400
commit4e4cbee93d56137ebff722be022cae5f70ef84fb (patch)
tree4fa7345155599fc6bdd653fca8c5224ddf90a5be /drivers/nvdimm/btt.c
parentfc17b6534eb8395f0b3133eb31d87deec32c642b (diff)
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>
Diffstat (limited to 'drivers/nvdimm/btt.c')
-rw-r--r--drivers/nvdimm/btt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 983718b8fd9b..31b2d14e210d 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1210,7 +1210,7 @@ static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
1210 * another kernel subsystem, and we just pass it through. 1210 * another kernel subsystem, and we just pass it through.
1211 */ 1211 */
1212 if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) { 1212 if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
1213 bio->bi_error = -EIO; 1213 bio->bi_status = BLK_STS_IOERR;
1214 goto out; 1214 goto out;
1215 } 1215 }
1216 1216
@@ -1232,7 +1232,7 @@ static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
1232 (op_is_write(bio_op(bio))) ? "WRITE" : 1232 (op_is_write(bio_op(bio))) ? "WRITE" :
1233 "READ", 1233 "READ",
1234 (unsigned long long) iter.bi_sector, len); 1234 (unsigned long long) iter.bi_sector, len);
1235 bio->bi_error = err; 1235 bio->bi_status = errno_to_blk_status(err);
1236 break; 1236 break;
1237 } 1237 }
1238 } 1238 }