[PATCH] include buffer_head.h in actual users instead of fs.h (6/10)

Make the 7 file that need it in mm/ include buffer_head.h directly.
Once again most files shouln't need it and want fixing.

diff --git a/mm/filemap.c b/mm/filemap.c
index 67a7cf78292d0c72065f68908a0197248b3f03ed..5bf85ca926982ebb9d12e8832c35a0dc1b1f4c20 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -20,6 +20,16 @@
 #include <linux/iobuf.h>
 #include <linux/hash.h>
 #include <linux/writeback.h>
+/*
+ * This is needed for the following functions:
+ *  - try_to_release_page
+ *  - block_flushpage
+ *  - page_has_buffers
+ *  - generic_osync_inode
+ *
+ * FIXME: remove all knowledge of the buffer layer from this file
+ */
+#include <linux/buffer_head.h>
 
 #include <asm/uaccess.h>
 #include <asm/mman.h>

diff --git a/mm/mempool.c b/mm/mempool.c
index cd6454ec095fe418aa945b8de32b3c4d8487b1e8..ddda1172112e75f7eea65a36d2001de726d6a51d 100644 (file)
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -12,6 +12,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mempool.h>
+#include <linux/buffer_head.h>         /* for wakeup_bdflush() */
 
 static void add_element(mempool_t *pool, void *element)
 {

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 3918260b0c6abe1bf5d817b68bdb504600b4689f..b828ec63c68fafe59ae29bfcf47b27f07360647d 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -478,7 +478,10 @@ EXPORT_SYMBOL(write_one_page);
  *
  * For now, we treat swapper_space specially.  It doesn't use the normal
  * block a_ops.
+ *
+ * FIXME: this should move over to fs/buffer.c - buffer_heads have no business in mm/
  */
+#include <linux/buffer_head.h>
 int __set_page_dirty_buffers(struct page *page)
 {
        struct address_space * const mapping = page->mapping;

diff --git a/mm/page_io.c b/mm/page_io.c
index 85bb9049ee0f75f11161b3d34de631f47d36979e..a538151e8212ae94bd4c728675fcd1a3709e529e 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -15,6 +15,7 @@
 #include <linux/pagemap.h>
 #include <linux/swap.h>
 #include <linux/swapctl.h>
+#include <linux/buffer_head.h>         /* for brw_page() */
 
 #include <asm/pgtable.h>
 

diff --git a/mm/swap_state.c b/mm/swap_state.c
index e802fb3aa7072efb2ec8d1a657838dab773f657f..0cd45133da96d027670189d4c3bcfe5f020a7ffd 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
+#include <linux/buffer_head.h> /* for block_sync_page()/block_flushpage() */
 
 #include <asm/pgtable.h>
 

diff --git a/mm/swapfile.c b/mm/swapfile.c
index a1fe966321e76824bcfbfe8d85481f7bf4f5c501..1a032196a10d951f73f5fe088fb8dd2fe067ec50 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -16,7 +16,7 @@
 #include <linux/namei.h>
 #include <linux/shm.h>
 #include <linux/blkdev.h>
-#include <linux/compiler.h>
+#include <linux/buffer_head.h>         /* for block_flushpage() */
 
 #include <asm/pgtable.h>
 

diff --git a/mm/vmscan.c b/mm/vmscan.c
index e26168f2d3b8acb42ce418499b13189beb8285a0..e734c647280d39768fbdc966765fb300ec34d3d3 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -22,8 +22,8 @@
 #include <linux/highmem.h>
 #include <linux/file.h>
 #include <linux/writeback.h>
-#include <linux/compiler.h>
 #include <linux/suspend.h>
+#include <linux/buffer_head.h>         /* for try_to_release_page() */
 
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>