[PATCH] inline generic_writepages()

generic_writepages() is just a wrapper around mpage_writepages(), so
inline it.

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 50ee35de5e1113cfe2b0d11607828b49e61fdc12..2afbdb794943780da90d5ec84ce8eab6b4ec8849 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -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>
 

diff --git a/include/linux/mm.h b/include/linux/mm.h
index c470238148b61d4403f885049216018f09726ef4..0012e39004683b8aee71a62d8f7ac975c11c6eff 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -461,7 +461,6 @@ extern int filemap_sync(struct vm_area_struct *, unsigned long,     size_t, unsigned
 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 */

diff --git a/include/linux/mpage.h b/include/linux/mpage.h
index 929fca427465b14e7291a665bc2f84e523f7c293..52253d90f55dc1a3bae04b3d954d08d38eac7261 100644 (file)
--- a/include/linux/mpage.h
+++ b/include/linux/mpage.h
@@ -16,3 +16,8 @@ int mpage_readpage(struct page *page, get_block_t get_block);
 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);
+}

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 5420a670bc0dd86410ccc1bb30865b5c48cbbd59..b34e983207959204a71036f2ccff4e640a158587 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -316,12 +316,6 @@ int generic_vm_writeback(struct page *page, int *nr_to_write)
 }
 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)

diff --git a/mm/page_io.c b/mm/page_io.c
index 4b29e393a8218e4e5e1915db5dc9ff102f9256c4..5ecf8adba19642522d1a747722a33b555bf46307 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -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 *