block: prep work for batch completion

[karo-tx-linux.git] / fs / bio.c

diff --git a/fs/bio.c b/fs/bio.c
index 152be59bfe0f2dd59b549b80f92aa1fdaf53654e..0405ed9612d75d8a289babeb4727de638f038098 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1414,7 +1414,8 @@ void bio_unmap_user(struct bio *bio)
 }
 EXPORT_SYMBOL(bio_unmap_user);
 
-static void bio_map_kern_endio(struct bio *bio, int err)
+static void bio_map_kern_endio(struct bio *bio, int err,
+                              struct batch_complete *batch)
 {
        bio_put(bio);
 }
@@ -1486,7 +1487,8 @@ struct bio *bio_map_kern(struct request_queue *q, void *data, unsigned int len,
 }
 EXPORT_SYMBOL(bio_map_kern);
 
-static void bio_copy_kern_endio(struct bio *bio, int err)
+static void bio_copy_kern_endio(struct bio *bio, int err,
+                               struct batch_complete *batch)
 {
        struct bio_vec *bvec;
        const int read = bio_data_dir(bio) == READ;
@@ -1709,7 +1711,7 @@ void bio_endio(struct bio *bio, int error)
        trace_block_bio_complete(bio, error);
 
        if (bio->bi_end_io)
-               bio->bi_end_io(bio, error);
+               bio->bi_end_io(bio, error, NULL);
 }
 EXPORT_SYMBOL(bio_endio);
 
@@ -1724,7 +1726,8 @@ void bio_pair_release(struct bio_pair *bp)
 }
 EXPORT_SYMBOL(bio_pair_release);
 
-static void bio_pair_end_1(struct bio *bi, int err)
+static void bio_pair_end_1(struct bio *bi, int err,
+                          struct batch_complete *batch)
 {
        struct bio_pair *bp = container_of(bi, struct bio_pair, bio1);
 
@@ -1734,7 +1737,8 @@ static void bio_pair_end_1(struct bio *bi, int err)
        bio_pair_release(bp);
 }
 
-static void bio_pair_end_2(struct bio *bi, int err)
+static void bio_pair_end_2(struct bio *bi, int err,
+                          struct batch_complete *batch)
 {
        struct bio_pair *bp = container_of(bi, struct bio_pair, bio2);