block-aio-batch-completion-for-bios-kiocbs-fix-fix

fs/aio.c needs bio.h, move bio_endio_batch() declaration somewhere rational

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

diff --git a/fs/aio.c b/fs/aio.c
index b289b93ce326dcd297d702bd4814c3433c41c3c8..f183a8529f2a8d95136fb2ba607ac9083cdd4d62 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -25,6 +25,7 @@
 #include <linux/file.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
+#include <linux/bio.h>
 #include <linux/mmu_context.h>
 #include <linux/percpu.h>
 #include <linux/slab.h>

diff --git a/include/linux/bio.h b/include/linux/bio.h
index b4e9df5fffe9d1c6527464aef54dea22d85ea89b..28205a054fd402a04da37f54941ab8794538f312 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -241,8 +241,6 @@ static inline struct bio *bio_clone_kmalloc(struct bio *bio, gfp_t gfp_mask)
 
 }
 
-void bio_endio_batch(struct bio *bio, int error, struct batch_complete *batch);
-
 /**
  * bio_endio - end I/O on a bio
  * @bio:       bio
@@ -552,6 +550,8 @@ struct batch_complete {
        struct rb_root          kiocb;
 };
 
+void bio_endio_batch(struct bio *bio, int error, struct batch_complete *batch);
+
 static inline void batch_complete_init(struct batch_complete *batch)
 {
        bio_list_init(&batch->bio);