[PATCH 16/48] writeback: separate out include/linux/backing-dev-defs.h
With the planned cgroup writeback support, backing-dev related declarations will be more widely used across block and cgroup; unfortunately, including backing-dev.h from include/linux/blkdev.h makes cyclic include dependency quite likely. This patch separates out backing-dev-defs.h which only has the essential definitions and updates blkdev.h to include it. c files which need access to more backing-dev details now include backing-dev.h directly. This takes backing-dev.h off the common include dependency chain making it a lot easier to use it across block and cgroup. Signed-off-by: Tejun Heo Cc: Jens Axboe --- block/blk-integrity.c| 1 + block/blk-sysfs.c| 1 + block/bounce.c | 1 + block/genhd.c| 1 + drivers/block/drbd/drbd_int.h| 1 + drivers/block/pktcdvd.c | 1 + drivers/char/raw.c | 1 + drivers/md/bcache/request.c | 1 + drivers/md/dm.h | 1 + drivers/md/md.h | 1 + drivers/mtd/devices/block2mtd.c | 1 + fs/block_dev.c | 1 + fs/ext4/extents.c| 1 + fs/ext4/mballoc.c| 1 + fs/ext4/super.c | 1 + fs/f2fs/segment.h| 1 + fs/hfs/super.c | 1 + fs/hfsplus/super.c | 1 + fs/nfs/filelayout/filelayout.c | 1 + fs/ocfs2/file.c | 1 + fs/reiserfs/super.c | 1 + fs/ufs/super.c | 1 + fs/xfs/xfs_file.c| 1 + include/linux/backing-dev-defs.h | 106 +++ include/linux/backing-dev.h | 102 + include/linux/blkdev.h | 2 +- mm/madvise.c | 1 + 27 files changed, 132 insertions(+), 102 deletions(-) create mode 100644 include/linux/backing-dev-defs.h diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 79ffb48..f548b64 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -21,6 +21,7 @@ */ #include +#include #include #include #include diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 5677eb7..1b60941 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/block/bounce.c b/block/bounce.c index ab21ba2..c616a60 100644 --- a/block/bounce.c +++ b/block/bounce.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/block/genhd.c b/block/genhd.c index 0a536dc..d46ba56 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index b905e98..efd19c2 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 09e628da..4c20c22 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 6e29bf2..ee47e59 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index ab43fad..9c083b9 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -15,6 +15,7 @@ #include #include #include +#include #include diff --git a/drivers/md/dm.h b/drivers/md/dm.h index 59f53e7..ae4a3ca 100644 --- a/drivers/md/dm.h +++ b/drivers/md/dm.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/md/md.h b/drivers/md/md.h index 318ca8f..641abb5 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -16,6 +16,7 @@ #define _MD_MD_H #include +#include #include #include #include diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index 66f0405..e22e40f 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/block_dev.c b/fs/block_dev.c index 975266b..e4f5f71 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index bed4308..21a7bcb 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "ext4_jbd2.h" #include "ext4_extents.h" #include "xattr.h" diff --git
[PATCH 16/48] writeback: separate out include/linux/backing-dev-defs.h
With the planned cgroup writeback support, backing-dev related declarations will be more widely used across block and cgroup; unfortunately, including backing-dev.h from include/linux/blkdev.h makes cyclic include dependency quite likely. This patch separates out backing-dev-defs.h which only has the essential definitions and updates blkdev.h to include it. c files which need access to more backing-dev details now include backing-dev.h directly. This takes backing-dev.h off the common include dependency chain making it a lot easier to use it across block and cgroup. Signed-off-by: Tejun Heo t...@kernel.org Cc: Jens Axboe ax...@kernel.dk --- block/blk-integrity.c| 1 + block/blk-sysfs.c| 1 + block/bounce.c | 1 + block/genhd.c| 1 + drivers/block/drbd/drbd_int.h| 1 + drivers/block/pktcdvd.c | 1 + drivers/char/raw.c | 1 + drivers/md/bcache/request.c | 1 + drivers/md/dm.h | 1 + drivers/md/md.h | 1 + drivers/mtd/devices/block2mtd.c | 1 + fs/block_dev.c | 1 + fs/ext4/extents.c| 1 + fs/ext4/mballoc.c| 1 + fs/ext4/super.c | 1 + fs/f2fs/segment.h| 1 + fs/hfs/super.c | 1 + fs/hfsplus/super.c | 1 + fs/nfs/filelayout/filelayout.c | 1 + fs/ocfs2/file.c | 1 + fs/reiserfs/super.c | 1 + fs/ufs/super.c | 1 + fs/xfs/xfs_file.c| 1 + include/linux/backing-dev-defs.h | 106 +++ include/linux/backing-dev.h | 102 + include/linux/blkdev.h | 2 +- mm/madvise.c | 1 + 27 files changed, 132 insertions(+), 102 deletions(-) create mode 100644 include/linux/backing-dev-defs.h diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 79ffb48..f548b64 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -21,6 +21,7 @@ */ #include linux/blkdev.h +#include linux/backing-dev.h #include linux/mempool.h #include linux/bio.h #include linux/scatterlist.h diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 5677eb7..1b60941 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -6,6 +6,7 @@ #include linux/module.h #include linux/bio.h #include linux/blkdev.h +#include linux/backing-dev.h #include linux/blktrace_api.h #include linux/blk-mq.h #include linux/blk-cgroup.h diff --git a/block/bounce.c b/block/bounce.c index ab21ba2..c616a60 100644 --- a/block/bounce.c +++ b/block/bounce.c @@ -13,6 +13,7 @@ #include linux/pagemap.h #include linux/mempool.h #include linux/blkdev.h +#include linux/backing-dev.h #include linux/init.h #include linux/hash.h #include linux/highmem.h diff --git a/block/genhd.c b/block/genhd.c index 0a536dc..d46ba56 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -8,6 +8,7 @@ #include linux/kdev_t.h #include linux/kernel.h #include linux/blkdev.h +#include linux/backing-dev.h #include linux/init.h #include linux/spinlock.h #include linux/proc_fs.h diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index b905e98..efd19c2 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -38,6 +38,7 @@ #include linux/mutex.h #include linux/major.h #include linux/blkdev.h +#include linux/backing-dev.h #include linux/genhd.h #include linux/idr.h #include net/tcp.h diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 09e628da..4c20c22 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -61,6 +61,7 @@ #include linux/freezer.h #include linux/mutex.h #include linux/slab.h +#include linux/backing-dev.h #include scsi/scsi_cmnd.h #include scsi/scsi_ioctl.h #include scsi/scsi.h diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 6e29bf2..ee47e59 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c @@ -12,6 +12,7 @@ #include linux/fs.h #include linux/major.h #include linux/blkdev.h +#include linux/backing-dev.h #include linux/module.h #include linux/raw.h #include linux/capability.h diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index ab43fad..9c083b9 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -15,6 +15,7 @@ #include linux/module.h #include linux/hash.h #include linux/random.h +#include linux/backing-dev.h #include trace/events/bcache.h diff --git a/drivers/md/dm.h b/drivers/md/dm.h index 59f53e7..ae4a3ca 100644 --- a/drivers/md/dm.h +++ b/drivers/md/dm.h @@ -14,6 +14,7 @@ #include linux/device-mapper.h #include linux/list.h #include linux/blkdev.h +#include linux/backing-dev.h #include linux/hdreg.h #include linux/completion.h #include linux/kobject.h diff --git a/drivers/md/md.h b/drivers/md/md.h index 318ca8f..641abb5
