]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
block-prep-work-for-batch-completion-fix-2
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 26 Mar 2013 23:26:26 +0000 (10:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Apr 2013 07:30:07 +0000 (18:30 +1100)
fs/bio.c: In function 'submit_bio_wait':
fs/bio.c:786: warning: assignment from incompatible pointer type

Cc: Kent Overstreet <koverstreet@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/bio.c

index 0405ed9612d75d8a289babeb4727de638f038098..8c36915148e9e558ecd4c9da2d6c1eff48196f17 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -760,7 +760,8 @@ struct submit_bio_ret {
        int error;
 };
 
-static void submit_bio_wait_endio(struct bio *bio, int error)
+static void submit_bio_wait_endio(struct bio *bio, int error,
+                                 struct batch_complete *batch)
 {
        struct submit_bio_ret *ret = bio->bi_private;