From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx> Subject: include: remove pagemap.h from blkdev.h My UEK-derived config has 1030 files depending on pagemap.h before this change. Afterwards, just 326 files need to be rebuilt when I touch pagemap.h. I think blkdev.h is probably included too widely, but untangling that dependency is harder and this solves my problem. x86 allmodconfig builds, but there may be implicit include problems on other architectures. Link: https://lkml.kernel.org/r/20210309195747.283796-1-willy@xxxxxxxxxxxxx Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Acked-by: Dan Williams <dan.j.williams@xxxxxxxxx> [nvdimm] Acked-by: Jens Axboe <axboe@xxxxxxxxx> [block] Reviewed-by: Christoph Hellwig <hch@xxxxxx> Acked-by: Coly Li <colyli@xxxxxxx> [bcache] Acked-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> [scsi] Reviewed-by: William Kucharski <william.kucharski@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- block/blk-settings.c | 1 + drivers/block/brd.c | 1 + drivers/block/loop.c | 1 + drivers/md/bcache/super.c | 1 + drivers/nvdimm/btt.c | 1 + drivers/nvdimm/pmem.c | 1 + drivers/scsi/scsicam.c | 1 + include/linux/blkdev.h | 1 - include/linux/swap.h | 1 + 9 files changed, 8 insertions(+), 1 deletion(-) --- a/block/blk-settings.c~include-remove-pagemaph-from-blkdevh +++ a/block/blk-settings.c @@ -7,6 +7,7 @@ #include <linux/init.h> #include <linux/bio.h> #include <linux/blkdev.h> +#include <linux/pagemap.h> #include <linux/gcd.h> #include <linux/lcm.h> #include <linux/jiffies.h> --- a/drivers/block/brd.c~include-remove-pagemaph-from-blkdevh +++ a/drivers/block/brd.c @@ -18,6 +18,7 @@ #include <linux/bio.h> #include <linux/highmem.h> #include <linux/mutex.h> +#include <linux/pagemap.h> #include <linux/radix-tree.h> #include <linux/fs.h> #include <linux/slab.h> --- a/drivers/block/loop.c~include-remove-pagemaph-from-blkdevh +++ a/drivers/block/loop.c @@ -53,6 +53,7 @@ #include <linux/moduleparam.h> #include <linux/sched.h> #include <linux/fs.h> +#include <linux/pagemap.h> #include <linux/file.h> #include <linux/stat.h> #include <linux/errno.h> --- a/drivers/md/bcache/super.c~include-remove-pagemaph-from-blkdevh +++ a/drivers/md/bcache/super.c @@ -16,6 +16,7 @@ #include "features.h" #include <linux/blkdev.h> +#include <linux/pagemap.h> #include <linux/debugfs.h> #include <linux/genhd.h> #include <linux/idr.h> --- a/drivers/nvdimm/btt.c~include-remove-pagemaph-from-blkdevh +++ a/drivers/nvdimm/btt.c @@ -6,6 +6,7 @@ #include <linux/highmem.h> #include <linux/debugfs.h> #include <linux/blkdev.h> +#include <linux/pagemap.h> #include <linux/module.h> #include <linux/device.h> #include <linux/mutex.h> --- a/drivers/nvdimm/pmem.c~include-remove-pagemaph-from-blkdevh +++ a/drivers/nvdimm/pmem.c @@ -8,6 +8,7 @@ */ #include <linux/blkdev.h> +#include <linux/pagemap.h> #include <linux/hdreg.h> #include <linux/init.h> #include <linux/platform_device.h> --- a/drivers/scsi/scsicam.c~include-remove-pagemaph-from-blkdevh +++ a/drivers/scsi/scsicam.c @@ -17,6 +17,7 @@ #include <linux/genhd.h> #include <linux/kernel.h> #include <linux/blkdev.h> +#include <linux/pagemap.h> #include <linux/msdos_partition.h> #include <asm/unaligned.h> --- a/include/linux/blkdev.h~include-remove-pagemaph-from-blkdevh +++ a/include/linux/blkdev.h @@ -11,7 +11,6 @@ #include <linux/minmax.h> #include <linux/timer.h> #include <linux/workqueue.h> -#include <linux/pagemap.h> #include <linux/backing-dev-defs.h> #include <linux/wait.h> #include <linux/mempool.h> --- a/include/linux/swap.h~include-remove-pagemaph-from-blkdevh +++ a/include/linux/swap.h @@ -10,6 +10,7 @@ #include <linux/sched.h> #include <linux/node.h> #include <linux/fs.h> +#include <linux/pagemap.h> #include <linux/atomic.h> #include <linux/page-flags.h> #include <uapi/linux/mempolicy.h> _
