block: don't include blk-mq-sched.h in blk.h

No 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-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 2053d1b0e90ea22907ed0c0d7456135d9ca75343..1acd94ba10c7504aa411c7b72d6abe3f70667da6 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -46,6 +46,7 @@
 #include <trace/events/block.h>
 
 #include "blk.h"
+#include "blk-mq-sched.h"
 #include "blk-pm.h"
 #include "blk-throttle.h"
 

diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 57299f860d41ebb9d09414fe976def0e5ab6ac51..70c99e85aee5041a3170e03f8fbf27de50c422f5 100644 (file)
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -11,6 +11,7 @@
 #include <linux/sched/task.h>
 
 #include "blk.h"
+#include "blk-mq-sched.h"
 
 /*
  * For io context allocations

diff --git a/block/blk-merge.c b/block/blk-merge.c
index ba761c3f482ba69a2da29e327ab596f72e3765e2..456fb88c49b1d87fc4ba8564b94be33d4764889e 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -12,6 +12,7 @@
 #include <trace/events/block.h>
 
 #include "blk.h"
+#include "blk-mq-sched.h"
 #include "blk-rq-qos.h"
 #include "blk-throttle.h"
 

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index f4022b1985805032de2469fb98b64eecc8aa7a85..7f27dca3a45eb8b3b34ee1a4cb2c9cff75f1c1ab 100644 (file)
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -11,6 +11,7 @@
 #include "blk.h"
 #include "blk-mq.h"
 #include "blk-mq-debugfs.h"
+#include "blk-mq-sched.h"
 #include "blk-mq-tag.h"
 #include "blk-rq-qos.h"
 

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 772347adc56b38290001fbce9a88d38cbf11ceeb..4622da4bb9927537e366b0b8f2a8d907fa6de0e9 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -16,6 +16,7 @@
 #include "blk.h"
 #include "blk-mq.h"
 #include "blk-mq-debugfs.h"
+#include "blk-mq-sched.h"
 #include "blk-wbt.h"
 #include "blk-throttle.h"
 

diff --git a/block/blk.h b/block/blk.h
index 4df2ce8d4999b955d06e22100d2ca93b109dff40..db6efa351d3eca297f64a55fed1727b0e3c0aaf7 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -10,7 +10,6 @@
 #include <xen/xen.h>
 #include "blk-crypto-internal.h"
 #include "blk-mq.h"
-#include "blk-mq-sched.h"
 
 struct elevator_type;
 

diff --git a/block/genhd.c b/block/genhd.c
index 8e9cbf23c510afb66c89981c2b0b8560789bed9d..01606db8c625d43f14de49842271c6610847d79b 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -27,6 +27,7 @@
 #include <linux/badblocks.h>
 
 #include "blk.h"
+#include "blk-mq-sched.h"
 #include "blk-rq-qos.h"
 
 static struct kobject *block_depr;