block: switch bios to blk_status_t

[mirror_ubuntu-artful-kernel.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 888e7801c6381edd8d995503643917b2f452282e..7a5c8ed27f42e4ae50a5aae64a1c4a580513c114 100644 (file)
--- 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);
        }