summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-02-20 13:16:55 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-03-01 15:17:34 +1100
commit8841804b3efe574588fee7226b346b7fcbefa042 (patch)
tree64ef118a06ac3e24c459ad49613af15411c37862
parent81777fd3839a7d8940c374e899807914d95955bb (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 63e7c4b8727c..8338874e8453 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);