block: add a bi_error field to struct bio

[linux-2.6-block.git] / drivers / md / bcache / writeback.c

diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c
index f1986bcd1bf05e1058e26946c600a6e2c1f5991d..b4fc874c30fdffcfdd43a8b37873c9dfa5e18568 100644 (file)
--- a/drivers/md/bcache/writeback.c
+++ b/drivers/md/bcache/writeback.c
@@ -166,12 +166,12 @@ static void write_dirty_finish(struct closure *cl)
        closure_return_with_destructor(cl, dirty_io_destructor);
 }
 
-static void dirty_endio(struct bio *bio, int error)
+static void dirty_endio(struct bio *bio)
 {
        struct keybuf_key *w = bio->bi_private;
        struct dirty_io *io = w->private;
 
-       if (error)
+       if (bio->bi_error)
                SET_KEY_DIRTY(&w->key, false);
 
        closure_put(&io->cl);
@@ -193,15 +193,15 @@ static void write_dirty(struct closure *cl)
        continue_at(cl, write_dirty_finish, system_wq);
 }
 
-static void read_dirty_endio(struct bio *bio, int error)
+static void read_dirty_endio(struct bio *bio)
 {
        struct keybuf_key *w = bio->bi_private;
        struct dirty_io *io = w->private;
 
        bch_count_io_errors(PTR_CACHE(io->dc->disk.c, &w->key, 0),
-                           error, "reading dirty data from cache");
+                           bio->bi_error, "reading dirty data from cache");
 
-       dirty_endio(bio, error);
+       dirty_endio(bio);
 }
 
 static void read_dirty_submit(struct closure *cl)