block: add a bi_error field to struct bio

[mirror_ubuntu-artful-kernel.git] / fs / ocfs2 / cluster / heartbeat.c

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 16eff45727eeaa055852c3c50c2febac5d647006..140de3c93d2e31a0e468b8dd670cb5ffc5fcc686 100644 (file)
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -372,14 +372,13 @@ static void o2hb_wait_on_io(struct o2hb_region *reg,
        wait_for_completion(&wc->wc_io_complete);
 }
 
-static void o2hb_bio_end_io(struct bio *bio,
-                          int error)
+static void o2hb_bio_end_io(struct bio *bio)
 {
        struct o2hb_bio_wait_ctxt *wc = bio->bi_private;
 
-       if (error) {
-               mlog(ML_ERROR, "IO Error %d\n", error);
-               wc->wc_error = error;
+       if (bio->bi_error) {
+               mlog(ML_ERROR, "IO Error %d\n", bio->bi_error);
+               wc->wc_error = bio->bi_error;
        }
 
        o2hb_bio_wait_dec(wc, 1);