fs/block_dev.c | 1 +
include/linux/mm.h | 1 -
include/linux/mpage.h | 5 +++++
mm/page-writeback.c | 6 ------
mm/page_io.c | 1 +
5 files changed, 7 insertions(+), 7 deletions(-)
--- 2.5.26/mm/page-writeback.c~inline-generic_writepages Tue Jul 16 21:46:36 2002
+++ 2.5.26-akpm/mm/page-writeback.c Tue Jul 16 21:59:36 2002
@@ -316,12 +316,6 @@ int generic_vm_writeback(struct page *pa
}
EXPORT_SYMBOL(generic_vm_writeback);
-int generic_writepages(struct address_space *mapping, int *nr_to_write)
-{
- return mpage_writepages(mapping, nr_to_write, NULL);
-}
-EXPORT_SYMBOL(generic_writepages);
-
int do_writepages(struct address_space *mapping, int *nr_to_write)
{
if (mapping->a_ops->writepages)
--- 2.5.26/include/linux/mpage.h~inline-generic_writepages Tue Jul 16 21:46:36 2002
+++ 2.5.26-akpm/include/linux/mpage.h Tue Jul 16 21:46:36 2002
@@ -16,3 +16,8 @@ int mpage_readpage(struct page *page, ge
int mpage_writepages(struct address_space *mapping,
int *nr_to_write, get_block_t get_block);
+static inline int
+generic_writepages(struct address_space *mapping, int *nr_to_write)
+{
+ return mpage_writepages(mapping, nr_to_write, NULL);
+}
--- 2.5.26/fs/block_dev.c~inline-generic_writepages Tue Jul 16 21:46:36 2002
+++ 2.5.26-akpm/fs/block_dev.c Tue Jul 16 21:59:36 2002
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/blkpg.h>
#include <linux/buffer_head.h>
+#include <linux/mpage.h>
#include <asm/uaccess.h>
--- 2.5.26/mm/page_io.c~inline-generic_writepages Tue Jul 16 21:46:36 2002
+++ 2.5.26-akpm/mm/page_io.c Tue Jul 16 21:46:36 2002
@@ -17,6 +17,7 @@
#include <linux/bio.h>
#include <linux/swapops.h>
#include <linux/buffer_head.h> /* for block_sync_page() */
+#include <linux/mpage.h>
#include <asm/pgtable.h>
static struct bio *
--- 2.5.26/include/linux/mm.h~inline-generic_writepages Tue Jul 16 21:46:36 2002
+++ 2.5.26-akpm/include/linux/mm.h Tue Jul 16 21:59:35 2002
@@ -461,7 +461,6 @@ extern int filemap_sync(struct vm_area_s
extern struct page *filemap_nopage(struct vm_area_struct *, unsigned long, int);
/* mm/page-writeback.c */
-int generic_writepages(struct address_space *mapping, int *nr_to_write);
int write_one_page(struct page *page, int wait);
/* readahead.c */
.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/