diff options
author | Christoph Hellwig <hch@lst.de> | 2017-06-03 03:38:06 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-06-09 11:27:32 -0400 |
commit | 4e4cbee93d56137ebff722be022cae5f70ef84fb (patch) | |
tree | 4fa7345155599fc6bdd653fca8c5224ddf90a5be /drivers/lightnvm/pblk-read.c | |
parent | fc17b6534eb8395f0b3133eb31d87deec32c642b (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/pblk-read.c')
-rw-r--r-- | drivers/lightnvm/pblk-read.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c index 4a12f14d78c6..762c0b73cb67 100644 --- a/drivers/lightnvm/pblk-read.c +++ b/drivers/lightnvm/pblk-read.c | |||
@@ -114,7 +114,7 @@ static void pblk_end_io_read(struct nvm_rq *rqd) | |||
114 | pblk_log_read_err(pblk, rqd); | 114 | pblk_log_read_err(pblk, rqd); |
115 | #ifdef CONFIG_NVM_DEBUG | 115 | #ifdef CONFIG_NVM_DEBUG |
116 | else | 116 | else |
117 | WARN_ONCE(bio->bi_error, "pblk: corrupted read error\n"); | 117 | WARN_ONCE(bio->bi_status, "pblk: corrupted read error\n"); |
118 | #endif | 118 | #endif |
119 | 119 | ||
120 | if (rqd->nr_ppas > 1) | 120 | if (rqd->nr_ppas > 1) |
@@ -123,7 +123,7 @@ static void pblk_end_io_read(struct nvm_rq *rqd) | |||
123 | bio_put(bio); | 123 | bio_put(bio); |
124 | if (r_ctx->orig_bio) { | 124 | if (r_ctx->orig_bio) { |
125 | #ifdef CONFIG_NVM_DEBUG | 125 | #ifdef CONFIG_NVM_DEBUG |
126 | WARN_ONCE(r_ctx->orig_bio->bi_error, | 126 | WARN_ONCE(r_ctx->orig_bio->bi_status, |
127 | "pblk: corrupted read bio\n"); | 127 | "pblk: corrupted read bio\n"); |
128 | #endif | 128 | #endif |
129 | bio_endio(r_ctx->orig_bio); | 129 | bio_endio(r_ctx->orig_bio); |