* [PATCH 1/8] block: move blk_get_flush_queue to blk-flush.c
2021-11-23 18:53 decruft blk.h Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-23 18:53 ` [PATCH 2/8] block: remove elevator_exit Christoph Hellwig
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
blk_get_flush_queue is only used in blk-flush.c, so move it there.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-flush.c | 6 ++++++
block/blk.h | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 1fce6d16e6d3a..86ee50455e414 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -95,6 +95,12 @@ enum {
static void blk_kick_flush(struct request_queue *q,
struct blk_flush_queue *fq, unsigned int flags);
+static inline struct blk_flush_queue *
+blk_get_flush_queue(struct request_queue *q, struct blk_mq_ctx *ctx)
+{
+ return blk_mq_map_queue(q, REQ_OP_FLUSH, ctx)->fq;
+}
+
static unsigned int blk_flush_policy(unsigned long fflags, struct request *rq)
{
unsigned int policy = 0;
diff --git a/block/blk.h b/block/blk.h
index 5d4d08df772b9..1346085d89cee 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -35,12 +35,6 @@ extern struct kmem_cache *blk_requestq_cachep;
extern struct kobj_type blk_queue_ktype;
extern struct ida blk_queue_ida;
-static inline struct blk_flush_queue *
-blk_get_flush_queue(struct request_queue *q, struct blk_mq_ctx *ctx)
-{
- return blk_mq_map_queue(q, REQ_OP_FLUSH, ctx)->fq;
-}
-
static inline void __blk_get_queue(struct request_queue *q)
{
kobject_get(&q->kobj);
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/8] block: remove elevator_exit
2021-11-23 18:53 decruft blk.h Christoph Hellwig
2021-11-23 18:53 ` [PATCH 1/8] block: move blk_get_flush_queue to blk-flush.c Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-23 18:53 ` [PATCH 3/8] block: remove the e argument to elevator_exit Christoph Hellwig
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
Open code elevator_exit in it's only caller, and rename __elevator_exit to
elevator_exit.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-sysfs.c | 2 +-
block/blk.h | 11 +----------
block/elevator.c | 4 +++-
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index e1b846ec58cb8..cc6221c3f0d10 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -747,7 +747,7 @@ static void blk_exit_queue(struct request_queue *q)
*/
if (q->elevator) {
ioc_clear_queue(q);
- __elevator_exit(q, q->elevator);
+ elevator_exit(q, q->elevator);
}
/*
diff --git a/block/blk.h b/block/blk.h
index 1346085d89cee..2266cb1f7df53 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -266,19 +266,10 @@ void blk_insert_flush(struct request *rq);
int elevator_switch_mq(struct request_queue *q,
struct elevator_type *new_e);
-void __elevator_exit(struct request_queue *, struct elevator_queue *);
+void elevator_exit(struct request_queue *, struct elevator_queue *);
int elv_register_queue(struct request_queue *q, bool uevent);
void elv_unregister_queue(struct request_queue *q);
-static inline void elevator_exit(struct request_queue *q,
- struct elevator_queue *e)
-{
- lockdep_assert_held(&q->sysfs_lock);
-
- blk_mq_sched_free_rqs(q);
- __elevator_exit(q, e);
-}
-
ssize_t part_size_show(struct device *dev, struct device_attribute *attr,
char *buf);
ssize_t part_stat_show(struct device *dev, struct device_attribute *attr,
diff --git a/block/elevator.c b/block/elevator.c
index 19a78d5516ba7..3536cdd5fa129 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -188,7 +188,7 @@ static void elevator_release(struct kobject *kobj)
kfree(e);
}
-void __elevator_exit(struct request_queue *q, struct elevator_queue *e)
+void elevator_exit(struct request_queue *q, struct elevator_queue *e)
{
mutex_lock(&e->sysfs_lock);
blk_mq_exit_sched(q, e);
@@ -595,6 +595,7 @@ int elevator_switch_mq(struct request_queue *q,
elv_unregister_queue(q);
ioc_clear_queue(q);
+ blk_mq_sched_free_rqs(q);
elevator_exit(q, q->elevator);
}
@@ -605,6 +606,7 @@ int elevator_switch_mq(struct request_queue *q,
if (new_e) {
ret = elv_register_queue(q, true);
if (ret) {
+ blk_mq_sched_free_rqs(q);
elevator_exit(q, q->elevator);
goto out;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/8] block: remove the e argument to elevator_exit
2021-11-23 18:53 decruft blk.h Christoph Hellwig
2021-11-23 18:53 ` [PATCH 1/8] block: move blk_get_flush_queue to blk-flush.c Christoph Hellwig
2021-11-23 18:53 ` [PATCH 2/8] block: remove elevator_exit Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-23 18:53 ` [PATCH 4/8] block: don't include blk-mq-sched.h in blk.h Christoph Hellwig
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
All callers pass q->elevator.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-sysfs.c | 2 +-
block/blk.h | 2 +-
block/elevator.c | 8 +++++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index cc6221c3f0d10..87ce3b1414c81 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -747,7 +747,7 @@ static void blk_exit_queue(struct request_queue *q)
*/
if (q->elevator) {
ioc_clear_queue(q);
- elevator_exit(q, q->elevator);
+ elevator_exit(q);
}
/*
diff --git a/block/blk.h b/block/blk.h
index 2266cb1f7df53..4df2ce8d4999b 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -266,7 +266,7 @@ void blk_insert_flush(struct request *rq);
int elevator_switch_mq(struct request_queue *q,
struct elevator_type *new_e);
-void elevator_exit(struct request_queue *, struct elevator_queue *);
+void elevator_exit(struct request_queue *q);
int elv_register_queue(struct request_queue *q, bool uevent);
void elv_unregister_queue(struct request_queue *q);
diff --git a/block/elevator.c b/block/elevator.c
index 3536cdd5fa129..ec98aed39c4f5 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -188,8 +188,10 @@ static void elevator_release(struct kobject *kobj)
kfree(e);
}
-void elevator_exit(struct request_queue *q, struct elevator_queue *e)
+void elevator_exit(struct request_queue *q)
{
+ struct elevator_queue *e = q->elevator;
+
mutex_lock(&e->sysfs_lock);
blk_mq_exit_sched(q, e);
mutex_unlock(&e->sysfs_lock);
@@ -596,7 +598,7 @@ int elevator_switch_mq(struct request_queue *q,
ioc_clear_queue(q);
blk_mq_sched_free_rqs(q);
- elevator_exit(q, q->elevator);
+ elevator_exit(q);
}
ret = blk_mq_init_sched(q, new_e);
@@ -607,7 +609,7 @@ int elevator_switch_mq(struct request_queue *q,
ret = elv_register_queue(q, true);
if (ret) {
blk_mq_sched_free_rqs(q);
- elevator_exit(q, q->elevator);
+ elevator_exit(q);
goto out;
}
}
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/8] block: don't include blk-mq-sched.h in blk.h
2021-11-23 18:53 decruft blk.h Christoph Hellwig
` (2 preceding siblings ...)
2021-11-23 18:53 ` [PATCH 3/8] block: remove the e argument to elevator_exit Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-23 18:53 ` [PATCH 5/8] block: don't include blk-mq.h " Christoph Hellwig
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
No needed, shift it into the source files that need it instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-core.c | 1 +
block/blk-ioc.c | 1 +
block/blk-merge.c | 1 +
block/blk-mq-debugfs.c | 1 +
block/blk-sysfs.c | 1 +
block/blk.h | 1 -
block/genhd.c | 1 +
7 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 6ae8297b033f7..f9b77f4ce3703 100644
--- 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 736e0280d76f7..35c6b26a9f776 100644
--- 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 ba761c3f482ba..456fb88c49b1d 100644
--- 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 4f2cf8399f3de..d83ae7dac6081 100644
--- 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 87ce3b1414c81..73b4a8730dc4d 100644
--- 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 4df2ce8d4999b..db6efa351d3ec 100644
--- 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 8e9cbf23c510a..01606db8c625d 100644
--- 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;
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/8] block: don't include blk-mq.h in blk.h
2021-11-23 18:53 decruft blk.h Christoph Hellwig
` (3 preceding siblings ...)
2021-11-23 18:53 ` [PATCH 4/8] block: don't include blk-mq-sched.h in blk.h Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-23 18:53 ` [PATCH 6/8] block: don't include <linux/blk-mq.h> " Christoph Hellwig
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
No needed, shift a blk-stat.h include into the source file that needs it
instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-throttle.c | 1 +
block/blk.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 39bb6e68a9a29..7c462c006b269 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -13,6 +13,7 @@
#include <linux/blk-cgroup.h>
#include "blk.h"
#include "blk-cgroup-rwstat.h"
+#include "blk-stat.h"
#include "blk-throttle.h"
/* Max dispatch from a group in 1 round */
diff --git a/block/blk.h b/block/blk.h
index db6efa351d3ec..0f9472bea6167 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -9,7 +9,6 @@
#include <linux/memblock.h> /* for max_pfn/max_low_pfn */
#include <xen/xen.h>
#include "blk-crypto-internal.h"
-#include "blk-mq.h"
struct elevator_type;
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/8] block: don't include <linux/blk-mq.h> in blk.h
2021-11-23 18:53 decruft blk.h Christoph Hellwig
` (4 preceding siblings ...)
2021-11-23 18:53 ` [PATCH 5/8] block: don't include blk-mq.h " Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-23 18:53 ` [PATCH 7/8] block: don't include <linux/idr.h> " Christoph Hellwig
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
Not needed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/block/blk.h b/block/blk.h
index 0f9472bea6167..a6e9ce3767802 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -3,7 +3,6 @@
#define BLK_INTERNAL_H
#include <linux/idr.h>
-#include <linux/blk-mq.h>
#include <linux/part_stat.h>
#include <linux/blk-crypto.h>
#include <linux/memblock.h> /* for max_pfn/max_low_pfn */
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 7/8] block: don't include <linux/idr.h> in blk.h
2021-11-23 18:53 decruft blk.h Christoph Hellwig
` (5 preceding siblings ...)
2021-11-23 18:53 ` [PATCH 6/8] block: don't include <linux/blk-mq.h> " Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-23 18:53 ` [PATCH 8/8] block: don't include <linux/part_stat.h> " Christoph Hellwig
2021-11-24 15:33 ` decruft blk.h Jens Axboe
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
Not needed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/block/blk.h b/block/blk.h
index a6e9ce3767802..4089aeffca4b0 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -2,7 +2,6 @@
#ifndef BLK_INTERNAL_H
#define BLK_INTERNAL_H
-#include <linux/idr.h>
#include <linux/part_stat.h>
#include <linux/blk-crypto.h>
#include <linux/memblock.h> /* for max_pfn/max_low_pfn */
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 8/8] block: don't include <linux/part_stat.h> in blk.h
2021-11-23 18:53 decruft blk.h Christoph Hellwig
` (6 preceding siblings ...)
2021-11-23 18:53 ` [PATCH 7/8] block: don't include <linux/idr.h> " Christoph Hellwig
@ 2021-11-23 18:53 ` Christoph Hellwig
2021-11-24 15:33 ` decruft blk.h Jens Axboe
8 siblings, 0 replies; 10+ messages in thread
From: Christoph Hellwig @ 2021-11-23 18:53 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
Not needed, shift it into the source files that need it instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-cgroup.c | 1 +
block/blk-core.c | 1 +
block/blk-flush.c | 1 +
block/blk-merge.c | 1 +
block/blk-mq.c | 1 +
block/blk.h | 1 -
block/genhd.c | 1 +
7 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 663aabfeba183..650f7e27989f1 100644
--- 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 f9b77f4ce3703..143cc21db5ef5 100644
--- 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 86ee50455e414..902e80e48e4ae 100644
--- 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 456fb88c49b1d..e07f5a1ae86e2 100644
--- 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 cb41c441aa8fa..871220a038225 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -29,6 +29,7 @@
#include <linux/prefetch.h>
#include <linux/blk-crypto.h>
#include <linux/sched/sysctl.h>
+#include <linux/part_stat.h>
#include <trace/events/block.h>
diff --git a/block/blk.h b/block/blk.h
index 4089aeffca4b0..a57c84654d0a1 100644
--- 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 01606db8c625d..5179a4f00fba5 100644
--- 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"
--
2.30.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: decruft blk.h
2021-11-23 18:53 decruft blk.h Christoph Hellwig
` (7 preceding siblings ...)
2021-11-23 18:53 ` [PATCH 8/8] block: don't include <linux/part_stat.h> " Christoph Hellwig
@ 2021-11-24 15:33 ` Jens Axboe
8 siblings, 0 replies; 10+ messages in thread
From: Jens Axboe @ 2021-11-24 15:33 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-block
On Tue, 23 Nov 2021 19:53:04 +0100, Christoph Hellwig wrote:
> this series cleans up blk.h by moving various bits that are not needed
> out of it.
>
> Diffstat:
> blk-cgroup.c | 1 +
> blk-core.c | 2 ++
> blk-flush.c | 7 +++++++
> blk-ioc.c | 1 +
> blk-merge.c | 2 ++
> blk-mq-debugfs.c | 1 +
> blk-mq.c | 1 +
> blk-sysfs.c | 3 ++-
> blk-throttle.c | 1 +
> blk.h | 22 +---------------------
> elevator.c | 10 +++++++---
> genhd.c | 2 ++
> 12 files changed, 28 insertions(+), 25 deletions(-)
>
> [...]
Applied, thanks!
[1/8] block: move blk_get_flush_queue to blk-flush.c
commit: b717f549c852e72ddf7c1140702da9e27ffaca7c
[2/8] block: remove elevator_exit
commit: b4ef8cf4ee9cdf8d3f77f265028ddfcda7da47c0
[3/8] block: remove the e argument to elevator_exit
commit: 9bd06db7f49c0c60b0368a21c8d25cd3f356c1b6
[4/8] block: don't include blk-mq-sched.h in blk.h
commit: 10e69ae57a1d4a026de15a9c9058c79ecd47e287
[5/8] block: don't include blk-mq.h in blk.h
commit: c6d21307452ddda76dd132d0a6aa99e8ebf0a9bb
[6/8] block: don't include <linux/blk-mq.h> in blk.h
commit: 8ac269b7ebd5329c287fcd644f89508abf605d1f
[7/8] block: don't include <linux/idr.h> in blk.h
commit: 65db5bdc941eab6e3d2adee483d1cb0ec70a39ad
[8/8] block: don't include <linux/part_stat.h> in blk.h
commit: b1d1d48b8b3a90b4eb28fe3222ca57c6266e211c
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 10+ messages in thread