From: Yu Kuai <yukuai@fnnas.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Ming Lei <ming.lei@redhat.com>,
Nilay Shroff <nilay@linux.ibm.com>,
Hannes Reinecke <hare@suse.de>,
yukuai@fnnas.com
Subject: [PATCH v9 6/8] blk-mq-debugfs: remove blk_mq_debugfs_unregister_rqos()
Date: Mon, 2 Feb 2026 16:05:21 +0800 [thread overview]
Message-ID: <20260202080523.3947504-7-yukuai@fnnas.com> (raw)
In-Reply-To: <20260202080523.3947504-1-yukuai@fnnas.com>
Because this helper is only used by iocost and iolatency, while they
don't have debugfs entries.
Signed-off-by: Yu Kuai <yukuai@fnnas.com>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
block/blk-mq-debugfs.c | 10 ----------
block/blk-mq-debugfs.h | 4 ----
block/blk-rq-qos.c | 4 ----
3 files changed, 18 deletions(-)
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 11f00a868541..22c182b40bc3 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -734,16 +734,6 @@ static const char *rq_qos_id_to_name(enum rq_qos_id id)
return "unknown";
}
-void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)
-{
- lockdep_assert_held(&rqos->disk->queue->debugfs_mutex);
-
- if (!rqos->disk->queue->debugfs_dir)
- return;
- debugfs_remove_recursive(rqos->debugfs_dir);
- rqos->debugfs_dir = NULL;
-}
-
static void blk_mq_debugfs_register_rqos(struct rq_qos *rqos)
{
struct request_queue *q = rqos->disk->queue;
diff --git a/block/blk-mq-debugfs.h b/block/blk-mq-debugfs.h
index d94daa66556b..49bb1aaa83dc 100644
--- a/block/blk-mq-debugfs.h
+++ b/block/blk-mq-debugfs.h
@@ -34,7 +34,6 @@ void blk_mq_debugfs_register_sched_hctx(struct request_queue *q,
void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx);
void blk_mq_debugfs_register_rq_qos(struct request_queue *q);
-void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos);
#else
static inline void blk_mq_debugfs_register(struct request_queue *q)
{
@@ -78,9 +77,6 @@ static inline void blk_mq_debugfs_register_rq_qos(struct request_queue *q)
{
}
-static inline void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)
-{
-}
#endif
#if defined(CONFIG_BLK_DEV_ZONED) && defined(CONFIG_BLK_DEBUG_FS)
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index d7ce99ce2e80..85cf74402a09 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -371,8 +371,4 @@ void rq_qos_del(struct rq_qos *rqos)
if (!q->rq_qos)
blk_queue_flag_clear(QUEUE_FLAG_QOS_ENABLED, q);
blk_mq_unfreeze_queue(q, memflags);
-
- mutex_lock(&q->debugfs_mutex);
- blk_mq_debugfs_unregister_rqos(rqos);
- mutex_unlock(&q->debugfs_mutex);
}
--
2.51.0
next prev parent reply other threads:[~2026-02-02 8:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 8:05 [PATCH v9 0/8] blk-mq: fix possible deadlocks Yu Kuai
2026-02-02 8:05 ` [PATCH v9 1/8] blk-wbt: factor out a helper wbt_set_lat() Yu Kuai
2026-02-02 8:05 ` [PATCH v9 2/8] blk-wbt: fix possible deadlock to nest pcpu_alloc_mutex under q_usage_counter Yu Kuai
2026-02-02 8:05 ` [PATCH v9 3/8] blk-mq-debugfs: factor out a helper to register debugfs for all rq_qos Yu Kuai
2026-02-02 8:05 ` [PATCH v9 4/8] blk-rq-qos: fix possible debugfs_mutex deadlock Yu Kuai
2026-02-02 8:05 ` [PATCH v9 5/8] blk-mq-debugfs: make blk_mq_debugfs_register_rqos() static Yu Kuai
2026-02-02 8:05 ` Yu Kuai [this message]
2026-02-02 8:05 ` [PATCH v9 7/8] blk-mq-debugfs: add missing debugfs_mutex in blk_mq_debugfs_register_hctxs() Yu Kuai
2026-02-02 8:05 ` [PATCH v9 8/8] blk-mq-debugfs: warn about possible deadlock Yu Kuai
2026-02-06 9:26 ` kernel test robot
2026-02-02 15:21 ` [PATCH v9 0/8] blk-mq: fix possible deadlocks Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260202080523.3947504-7-yukuai@fnnas.com \
--to=yukuai@fnnas.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=nilay@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®