blk-mq: include <linux/blk-mq.h> in block/blk-mq.h

block/blk-mq.h needs various definitions from <linux/blk-mq.h>,
include it there instead of relying on the source files to include
both.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230413064057.707578-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-flush.c b/block/blk-flush.c
index a13a1d6caa0f3e4b2acd7e7c681cfd0fb5cc5ba7..3c81b0af5b396485a0db8bc8fa8e82c64fee7e80 100644 (file)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -68,7 +68,6 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/gfp.h>
-#include <linux/blk-mq.h>
 #include <linux/part_stat.h>
 
 #include "blk.h"

diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c
index 0c612c19feb8b1ad9531f4fe984ffa7b6e9b6e6e..9638b25fd52124f0173e968ebdca5f1fe0b42ad9 100644 (file)
--- a/block/blk-mq-cpumap.c
+++ b/block/blk-mq-cpumap.c
@@ -12,7 +12,6 @@
 #include <linux/cpu.h>
 #include <linux/group_cpus.h>
 
-#include <linux/blk-mq.h>
 #include "blk.h"
 #include "blk-mq.h"
 

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index ace2bcf1cf9a6f8e9ea20ce35a4bb43c00a78741..d23a8554ec4aeb15dac8375b0973b7ebd06af5c7 100644 (file)
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -7,7 +7,6 @@
 #include <linux/blkdev.h>
 #include <linux/debugfs.h>
 
-#include <linux/blk-mq.h>
 #include "blk.h"
 #include "blk-mq.h"
 #include "blk-mq-debugfs.h"

diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
index a90b88fd1332ce68582487643e305058f9403165..d47b5c73c9eb715be7627a2952ad0ef921dd5bc6 100644 (file)
--- a/block/blk-mq-pci.c
+++ b/block/blk-mq-pci.c
@@ -4,7 +4,6 @@
  */
 #include <linux/kobject.h>
 #include <linux/blkdev.h>
-#include <linux/blk-mq.h>
 #include <linux/blk-mq-pci.h>
 #include <linux/pci.h>
 #include <linux/module.h>

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 1029e8eed5eef6668cbd5fece57e0849e8417d7c..c4b2d44b2d4ebf26a2a7e92aaa8fbf0e3c7f7b7c 100644 (file)
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -6,7 +6,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/blk-mq.h>
 #include <linux/list_sort.h>
 
 #include <trace/events/block.h>

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index ba84caa868dd543c49e0c6b7f322e18665a7bfb8..156e9bb07abf1a4801f35f7197674b723155a5d8 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -10,7 +10,6 @@
 #include <linux/workqueue.h>
 #include <linux/smp.h>
 
-#include <linux/blk-mq.h>
 #include "blk.h"
 #include "blk-mq.h"
 

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 1f8b065d72c5f20777120f8ae976714f43f8039b..d6af9d431dc631989dce6709971d1fc042e89dc1 100644 (file)
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -9,7 +9,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include <linux/blk-mq.h>
 #include <linux/delay.h>
 #include "blk.h"
 #include "blk-mq.h"

diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c
index 6589f076a09635ca1ef3e68638cb7bd4708481ad..68d0945c0b08a2be116125f46c3a56fcdb02aea8 100644 (file)
--- a/block/blk-mq-virtio.c
+++ b/block/blk-mq-virtio.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2016 Christoph Hellwig.
  */
 #include <linux/device.h>
-#include <linux/blk-mq.h>
 #include <linux/blk-mq-virtio.h>
 #include <linux/virtio_config.h>
 #include <linux/module.h>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 545600be2063ac5d6a075034ef59330b4da11a13..29014a0f9f39b10853761e4f75ccde6093ce6d29 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -32,7 +32,6 @@
 
 #include <trace/events/block.h>
 
-#include <linux/blk-mq.h>
 #include <linux/t10-pi.h>
 #include "blk.h"
 #include "blk-mq.h"

diff --git a/block/blk-mq.h b/block/blk-mq.h
index 7a041fecea02e4aeac3c993a28dbfffe13c999ab..fa13b694ff27d6a6fcc4112b7bf7a24962e1ccb7 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -2,6 +2,7 @@
 #ifndef INT_BLK_MQ_H
 #define INT_BLK_MQ_H
 
+#include <linux/blk-mq.h>
 #include "blk-stat.h"
 
 struct blk_mq_tag_set;

diff --git a/block/blk-pm.c b/block/blk-pm.c
index 8af5ee54feb406f383df005382c7779806419919..6b72b2e03fc8a877fcf7dc412762cf6db42a382f 100644 (file)
--- a/block/blk-pm.c
+++ b/block/blk-pm.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 
-#include <linux/blk-mq.h>
 #include <linux/blk-pm.h>
 #include <linux/blkdev.h>
 #include <linux/pm_runtime.h>

diff --git a/block/blk-stat.c b/block/blk-stat.c
index bc7e0ed81642afd7ef814a3682b90b52fd0bd5e4..7ff76ae6c76a9531050af5e7a70c14af755eb403 100644 (file)
--- a/block/blk-stat.c
+++ b/block/blk-stat.c
@@ -6,7 +6,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/rculist.h>
-#include <linux/blk-mq.h>
 
 #include "blk-stat.h"
 #include "blk-mq.h"

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 1a743b4f29582d627cbca4e128bac7d85d01143a..a642085838531fc9e980179c51d4c6cedb57875d 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -9,7 +9,6 @@
 #include <linux/blkdev.h>
 #include <linux/backing-dev.h>
 #include <linux/blktrace_api.h>
-#include <linux/blk-mq.h>
 #include <linux/debugfs.h>
 
 #include "blk.h"

diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index d0a4838ce7fc63d4e3a9942a05f55343a958e02a..3f9fb2090c9158805556ebe6b83c8d6a9272af49 100644 (file)
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -8,7 +8,6 @@
 
 #include <linux/kernel.h>
 #include <linux/blkdev.h>
-#include <linux/blk-mq.h>
 #include <linux/module.h>
 #include <linux/sbitmap.h>
 

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index a18526e11194ca387ba38918f19366bf41c2532d..af9e79050dcc1fcc3f4f555da8b950d0aee506b8 100644 (file)
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/blkdev.h>
-#include <linux/blk-mq.h>
 #include <linux/bio.h>
 #include <linux/module.h>
 #include <linux/slab.h>