diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2013-04-26 10:58:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-26 17:33:09 +1000 |
| commit | c9646a31c95b830bf090821ee7281424ffb11637 (patch) | |
| tree | 6aef5a1f8e9ea7533316b494be335a80839388a2 | |
| parent | 821a48e5355bca05c966a05f493e3d2f0d03e329 (diff) | |
block-aio-batch-completion-for-bios-kiocbs-fix
Cc: Kent Overstreet <koverstreet@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | drivers/block/blockconsole.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/blockconsole.c b/drivers/block/blockconsole.c index 01ddbc6fa6b6..1600a19c183a 100644 --- a/drivers/block/blockconsole.c +++ b/drivers/block/blockconsole.c @@ -164,7 +164,8 @@ static void bcon_advance_console_bytes(struct blockconsole *bc, int bytes) } while (cmpxchg64(&bc->console_bytes, old, new) != old); } -static void request_complete(struct bio *bio, int err) +static void request_complete(struct bio *bio, int err, + struct batch_complete *batch) { complete((struct completion *)bio->bi_private); } @@ -289,7 +290,7 @@ static void bcon_unregister(struct work_struct *work) } #define BCON_MAX_ERRORS 10 -static void bcon_end_io(struct bio *bio, int err) +static void bcon_end_io(struct bio *bio, int err, struct batch_complete *batch) { struct bcon_bio *bcon_bio = container_of(bio, struct bcon_bio, bio); struct blockconsole *bc = bio->bi_private; |