[12/12] block: move rq_qos_exit() into disk_release()

Message ID	20220222141450.591193-13-hch@lst.de
State	Superseded
Headers	show Return-Path: <linux-scsi-owner@kernel.org> From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>, Ming Lei <ming.lei@redhat.com>, linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 12/12] block: move rq_qos_exit() into disk_release() Date: Tue, 22 Feb 2022 15:14:50 +0100 Message-Id: <20220222141450.591193-13-hch@lst.de> In-Reply-To: <20220222141450.591193-1-hch@lst.de> References: <20220222141450.591193-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/12] blk-mq: do not include passthrough requests in I/O accounting \| expand [01/12] blk-mq: do not include passthrough requests in I/O accounting [02/12] blk-mq: handle already freed tags gracefully in blk_mq_free_rqs [03/12] scsi: don't use disk->private_data to find the scsi_driver [04/12] sd: make use of ->free_disk to simplify refcounting [05/12] sd: remove the extra sdev_gendev reference [06/12] sr: implement ->free_disk [07/12] block: move blkcg initialization/destroy into disk allocation/release handler [08/12] block: don't remove hctx debugfs dir from blk_mq_exit_queue [09/12] block: move q_usage_counter release into blk_queue_release [10/12] block: move blk_exit_queue into disk_release [11/12] block: do more work in elevator_exit [12/12] block: move rq_qos_exit() into disk_release()

Message ID

20220222141450.591193-13-hch@lst.de

State

Superseded

Headers

From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
        Ming Lei <ming.lei@redhat.com>, linux-block@vger.kernel.org,
        linux-scsi@vger.kernel.org
Subject: [PATCH 12/12] block: move rq_qos_exit() into disk_release()
Date: Tue, 22 Feb 2022 15:14:50 +0100
Message-Id: <20220222141450.591193-13-hch@lst.de>
In-Reply-To: <20220222141450.591193-1-hch@lst.de>
References: <20220222141450.591193-1-hch@lst.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/12] blk-mq: do not include passthrough requests in I/O accounting | expand

Commit Message

Christoph Hellwig Feb. 22, 2022, 2:14 p.m. UTC

From: Ming Lei <ming.lei@redhat.com>

There can't be FS IO in disk_release(), so it is safe to move rq_qos_exit()
there.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 block/genhd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 40edff4331758..33d61bc10addc 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -627,7 +627,6 @@  void del_gendisk(struct gendisk *disk)
 
 	blk_mq_freeze_queue_wait(q);
 
-	rq_qos_exit(q);
 	blk_sync_queue(q);
 	blk_flush_integrity();
 	/*
@@ -1114,7 +1113,7 @@  static void blk_mq_release_queue(struct request_queue *q)
 		elevator_exit(q);
 		mutex_unlock(&q->sysfs_lock);
 	}
-
+	rq_qos_exit(q);
 	__blk_mq_unfreeze_queue(q, true);
 }

[12/12] block: move rq_qos_exit() into disk_release()

Commit Message

Patch