Merge branch 'upstream-merged'

1 files changed, 34 insertions, 0 deletions

diff --git a/libdde-linux26/contrib/include/linux/mpage.h b/libdde-linux26/contrib/include/linux/mpage.h
new file mode 100644
index 00000000..5c42821d
--- /dev/null
+++ b/libdde-linux26/contrib/include/linux/mpage.h
@@ -0,0 +1,34 @@
+/*
+ * include/linux/mpage.h
+ *
+ * Contains declarations related to preparing and submitting BIOS which contain
+ * multiple pagecache pages.
+ */
+
+/*
+ * (And no, it doesn't do the #ifdef __MPAGE_H thing, and it doesn't do
+ * nested includes.  Get it right in the .c file).
+ */
+#ifdef CONFIG_BLOCK
+
+struct mpage_data {
+	struct bio *bio;
+	sector_t last_block_in_bio;
+	get_block_t *get_block;
+	unsigned use_writepage;
+};
+
+struct writeback_control;
+
+struct bio *mpage_bio_submit(int rw, struct bio *bio);
+int mpage_readpages(struct address_space *mapping, struct list_head *pages,
+				unsigned nr_pages, get_block_t get_block);
+int mpage_readpage(struct page *page, get_block_t get_block);
+int __mpage_writepage(struct page *page, struct writeback_control *wbc,
+		      void *data);
+int mpage_writepages(struct address_space *mapping,
+		struct writeback_control *wbc, get_block_t get_block);
+int mpage_writepage(struct page *page, get_block_t *get_block,
+		struct writeback_control *wbc);
+
+#endif