summaryrefslogtreecommitdiffstats
path: root/drivers/lightnvm/rrpc.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/lightnvm/rrpc.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/lightnvm/rrpc.c')
-rw-r--r--drivers/lightnvm/rrpc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index cf0e28a0ff61..8d3b53bb3307 100644
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -279,8 +279,8 @@ static void rrpc_end_sync_bio(struct bio *bio)
279{ 279{
280 struct completion *waiting = bio->bi_private; 280 struct completion *waiting = bio->bi_private;
281 281
282 if (bio->bi_error) 282 if (bio->bi_status)
283 pr_err("nvm: gc request failed (%u).\n", bio->bi_error); 283 pr_err("nvm: gc request failed (%u).\n", bio->bi_status);
284 284
285 complete(waiting); 285 complete(waiting);
286} 286}
@@ -359,7 +359,7 @@ try:
359 goto finished; 359 goto finished;
360 } 360 }
361 wait_for_completion_io(&wait); 361 wait_for_completion_io(&wait);
362 if (bio->bi_error) { 362 if (bio->bi_status) {
363 rrpc_inflight_laddr_release(rrpc, rqd); 363 rrpc_inflight_laddr_release(rrpc, rqd);
364 goto finished; 364 goto finished;
365 } 365 }
@@ -385,7 +385,7 @@ try:
385 wait_for_completion_io(&wait); 385 wait_for_completion_io(&wait);
386 386
387 rrpc_inflight_laddr_release(rrpc, rqd); 387 rrpc_inflight_laddr_release(rrpc, rqd);
388 if (bio->bi_error) 388 if (bio->bi_status)
389 goto finished; 389 goto finished;
390 390
391 bio_reset(bio); 391 bio_reset(bio);