Skip to content

Commit 5ae4b12

Browse files
hailan94axboe
authored andcommitted
blk-mq-debugfs: remove blk_mq_debugfs_unregister_rqos()
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> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 70bafa5 commit 5ae4b12

3 files changed

Lines changed: 0 additions & 18 deletions

File tree

block/blk-mq-debugfs.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -734,16 +734,6 @@ static const char *rq_qos_id_to_name(enum rq_qos_id id)
734734
return "unknown";
735735
}
736736

737-
void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)
738-
{
739-
lockdep_assert_held(&rqos->disk->queue->debugfs_mutex);
740-
741-
if (!rqos->disk->queue->debugfs_dir)
742-
return;
743-
debugfs_remove_recursive(rqos->debugfs_dir);
744-
rqos->debugfs_dir = NULL;
745-
}
746-
747737
static void blk_mq_debugfs_register_rqos(struct rq_qos *rqos)
748738
{
749739
struct request_queue *q = rqos->disk->queue;

block/blk-mq-debugfs.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ void blk_mq_debugfs_register_sched_hctx(struct request_queue *q,
3434
void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx);
3535

3636
void blk_mq_debugfs_register_rq_qos(struct request_queue *q);
37-
void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos);
3837
#else
3938
static inline void blk_mq_debugfs_register(struct request_queue *q)
4039
{
@@ -78,9 +77,6 @@ static inline void blk_mq_debugfs_register_rq_qos(struct request_queue *q)
7877
{
7978
}
8079

81-
static inline void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)
82-
{
83-
}
8480
#endif
8581

8682
#if defined(CONFIG_BLK_DEV_ZONED) && defined(CONFIG_BLK_DEBUG_FS)

block/blk-rq-qos.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,4 @@ void rq_qos_del(struct rq_qos *rqos)
371371
if (!q->rq_qos)
372372
blk_queue_flag_clear(QUEUE_FLAG_QOS_ENABLED, q);
373373
blk_mq_unfreeze_queue(q, memflags);
374-
375-
mutex_lock(&q->debugfs_mutex);
376-
blk_mq_debugfs_unregister_rqos(rqos);
377-
mutex_unlock(&q->debugfs_mutex);
378374
}

0 commit comments

Comments
 (0)