block: add a bi_error field to struct bio

[mirror_ubuntu-bionic-kernel.git] / drivers / md / bcache / io.c

diff --git a/drivers/md/bcache/io.c b/drivers/md/bcache/io.c
index bf6a9ca18403f3a8bb0d289f43235eb59d79c786..9440df94bc8353bcd52097237ff5b4223b4aa0d7 100644 (file)
--- a/drivers/md/bcache/io.c
+++ b/drivers/md/bcache/io.c
@@ -55,19 +55,19 @@ static void bch_bio_submit_split_done(struct closure *cl)
 
        s->bio->bi_end_io = s->bi_end_io;
        s->bio->bi_private = s->bi_private;
-       bio_endio(s->bio, 0);
+       bio_endio(s->bio);
 
        closure_debug_destroy(&s->cl);
        mempool_free(s, s->p->bio_split_hook);
 }
 
-static void bch_bio_submit_split_endio(struct bio *bio, int error)
+static void bch_bio_submit_split_endio(struct bio *bio)
 {
        struct closure *cl = bio->bi_private;
        struct bio_split_hook *s = container_of(cl, struct bio_split_hook, cl);
 
-       if (error)
-               clear_bit(BIO_UPTODATE, &s->bio->bi_flags);
+       if (bio->bi_error)
+               s->bio->bi_error = bio->bi_error;
 
        bio_put(bio);
        closure_put(cl);