diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-16 13:55:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-16 13:55:02 +1000 |
| commit | 716529caab9957789c8035b8e50f38563e28b6bd (patch) | |
| tree | fa2c5bf68f4859d5ce8c84b041e6b2ad6a9cacda /drivers/md/bcache/io.c | |
| parent | c8f5f1dd7baf729c9ff305a43477068f9a80aafb (diff) | |
| parent | 8c9a4aa19547bdaca322bf5560adb35c8d0ebaef (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/md/bcache/io.c')
| -rw-r--r-- | drivers/md/bcache/io.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/bcache/io.c b/drivers/md/bcache/io.c index 48efd4dea645..29f344b9e408 100644 --- a/drivers/md/bcache/io.c +++ b/drivers/md/bcache/io.c @@ -9,7 +9,8 @@ #include "bset.h" #include "debug.h" -static void bch_bi_idx_hack_endio(struct bio *bio, int error) +static void bch_bi_idx_hack_endio(struct bio *bio, int error, + struct batch_complete *batch) { struct bio *p = bio->bi_private; @@ -206,7 +207,8 @@ static void bch_bio_submit_split_done(struct closure *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, int error, + struct batch_complete *batch) { struct closure *cl = bio->bi_private; struct bio_split_hook *s = container_of(cl, struct bio_split_hook, cl); |