diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-03 09:38:06 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-09 09:27:32 -0600 |
| commit | 4e4cbee93d56137ebff722be022cae5f70ef84fb (patch) | |
| tree | 4fa7345155599fc6bdd653fca8c5224ddf90a5be /block/bio.c | |
| parent | fc17b6534eb8395f0b3133eb31d87deec32c642b (diff) | |
| download | op-kernel-dev-4e4cbee93d56137ebff722be022cae5f70ef84fb.zip op-kernel-dev-4e4cbee93d56137ebff722be022cae5f70ef84fb.tar.gz | |
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 'block/bio.c')
| -rw-r--r-- | block/bio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/bio.c b/block/bio.c index 888e780..7a5c8ed 100644 --- a/block/bio.c +++ b/block/bio.c @@ -309,8 +309,8 @@ static struct bio *__bio_chain_endio(struct bio *bio) { struct bio *parent = bio->bi_private; - if (!parent->bi_error) - parent->bi_error = bio->bi_error; + if (!parent->bi_status) + parent->bi_status = bio->bi_status; bio_put(bio); return parent; } @@ -918,7 +918,7 @@ static void submit_bio_wait_endio(struct bio *bio) { struct submit_bio_ret *ret = bio->bi_private; - ret->error = bio->bi_error; + ret->error = blk_status_to_errno(bio->bi_status); complete(&ret->event); } @@ -1818,7 +1818,7 @@ again: if (bio->bi_bdev && bio_flagged(bio, BIO_TRACE_COMPLETION)) { trace_block_bio_complete(bdev_get_queue(bio->bi_bdev), - bio, bio->bi_error); + bio, bio->bi_status); bio_clear_flag(bio, BIO_TRACE_COMPLETION); } |
