Fix warnings with !CONFIG_BLOCK

Hide everything in blkdev.h with CONFIG_BLOCK isn't set, and fixup
the (few) files that fail to build because they were relying on blkdev.h
pulling in extra includes for them.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index a4b142a6a2c7f4c870a322bf9d3c9d00be1e8a5f..8d23b0b3871744a9fad98f3fcbdf5470083fb20d 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/fs.h>

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 492ac946391e08cdb9fd2e61e861a9c19749542d..a0a99814044732c22a28ee4548303a440b218014 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_BLKDEV_H
 #define _LINUX_BLKDEV_H
 
+#ifdef CONFIG_BLOCK
+
 #include <linux/sched.h>
 #include <linux/major.h>
 #include <linux/genhd.h>
@@ -32,8 +34,6 @@
 )
 #endif
 
-#ifdef CONFIG_BLOCK
-
 struct scsi_ioctl_command;
 
 struct request_queue;

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index b4af6bcb7b7aa26a67b3358598826f166e16e553..c7c3337c3a88c62991194b2f6e87bbb81935d4be 100644 (file)
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -5,6 +5,7 @@
 #define WRITEBACK_H
 
 #include <linux/sched.h>
+#include <linux/fs.h>
 
 struct backing_dev_info;
 

diff --git a/kernel/sched.c b/kernel/sched.c
index 6107a0cd6325f9afe219007e1e1e446fda899b78..6c10fa796ca040ef8da1f1e65acd58e4d7644faa 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -61,6 +61,7 @@
 #include <linux/delayacct.h>
 #include <linux/reciprocal_div.h>
 #include <linux/unistd.h>
+#include <linux/pagemap.h>
 
 #include <asm/tlb.h>
 

diff --git a/mm/readahead.c b/mm/readahead.c
index 39bf45d4332070a3e28f54e995fbac96add4585f..be20c9d699d3111f0f75d346deec70d8878fd54d 100644 (file)
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -15,6 +15,7 @@
 #include <linux/backing-dev.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/pagevec.h>
+#include <linux/pagemap.h>
 
 void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
 {