summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-03-02 15:25:54 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-03-07 14:27:27 +1100
commitbdca715a3d45a73aac5474bd1fffeabd8ae3e798 (patch)
tree115c361b166f27b3a4bf7e97b28748649a4edefc
parent20e5da3ddcd3cb405949085f5cf607f06f858769 (diff)
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>
-rw-r--r--fs/aio.c1
-rw-r--r--include/linux/bio.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index b289b93ce326..f183a8529f2a 100644
--- 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 b4e9df5fffe9..28205a054fd4 100644
--- 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);