block: don't include <linux/part_stat.h> in blk.h

Not needed, shift it into the source files that need it instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211123185312.1432157-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 663aabfeba183ae87a346b75a5af24f4a233bb47..650f7e27989f1989fa42da3f0a85d21aed221120 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -30,6 +30,7 @@
 #include <linux/blk-cgroup.h>
 #include <linux/tracehook.h>
 #include <linux/psi.h>
+#include <linux/part_stat.h>
 #include "blk.h"
 #include "blk-ioprio.h"
 #include "blk-throttle.h"

diff --git a/block/blk-core.c b/block/blk-core.c
index 1acd94ba10c7504aa411c7b72d6abe3f70667da6..b0660c9df8526bfeebb9b898d9af5e69ab4253c2 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -39,6 +39,7 @@
 #include <linux/debugfs.h>
 #include <linux/bpf.h>
 #include <linux/psi.h>
+#include <linux/part_stat.h>
 #include <linux/sched/sysctl.h>
 #include <linux/blk-crypto.h>
 

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 86ee50455e41404c90d3f3cdae0380c890929d24..902e80e48e4aeb25bcbe010093ab359af2644e16 100644 (file)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -69,6 +69,7 @@
 #include <linux/blkdev.h>
 #include <linux/gfp.h>
 #include <linux/blk-mq.h>
+#include <linux/part_stat.h>
 
 #include "blk.h"
 #include "blk-mq.h"

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 456fb88c49b1d87fc4ba8564b94be33d4764889e..e07f5a1ae86e2180ba9e49506549b8b2f7548cdd 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -8,6 +8,7 @@
 #include <linux/blkdev.h>
 #include <linux/blk-integrity.h>
 #include <linux/scatterlist.h>
+#include <linux/part_stat.h>
 
 #include <trace/events/block.h>
 

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 4dff401bc642ad1ead13730ac8fc6a6e5b712d47..4bdc3bc54ea3533af5781a3a77b1b4e4b90b9be0 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -28,6 +28,7 @@
 #include <linux/crash_dump.h>
 #include <linux/prefetch.h>
 #include <linux/blk-crypto.h>
+#include <linux/part_stat.h>
 
 #include <trace/events/block.h>
 

diff --git a/block/blk.h b/block/blk.h
index 4089aeffca4b05c96fc8ce7ab3972665315744f0..a57c84654d0a10c08d9422e6bc875ef08bcbe2ba 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -2,7 +2,6 @@
 #ifndef BLK_INTERNAL_H
 #define BLK_INTERNAL_H
 
-#include <linux/part_stat.h>
 #include <linux/blk-crypto.h>
 #include <linux/memblock.h>    /* for max_pfn/max_low_pfn */
 #include <xen/xen.h>

diff --git a/block/genhd.c b/block/genhd.c
index 01606db8c625d43f14de49842271c6610847d79b..5179a4f00fba5bcc77b9a37cc09b785ead91cfb7 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -25,6 +25,7 @@
 #include <linux/log2.h>
 #include <linux/pm_runtime.h>
 #include <linux/badblocks.h>
+#include <linux/part_stat.h>
 
 #include "blk.h"
 #include "blk-mq-sched.h"