diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-06-19 08:05:51 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-06-28 06:30:26 -0600 |
| commit | 6f8191fdf41d3a53cc1d63fe2234e812c55a0092 (patch) | |
| tree | 6d945fbe71814027c249acb00b86c6f35e6adfda /drivers/cdrom | |
| parent | block: stop setting the nomerges flags in blk_cleanup_queue (diff) | |
| download | linux-dev-6f8191fdf41d3a53cc1d63fe2234e812c55a0092.tar.xz linux-dev-6f8191fdf41d3a53cc1d63fe2234e812c55a0092.zip | |
block: simplify disk shutdown
Set the queue dying flag and call blk_mq_exit_queue from del_gendisk for
all disks that do not have separately allocated queues, and thus remove
the need to call blk_cleanup_queue for them.
Rename blk_cleanup_disk to blk_mq_destroy_queue to make it clear that
this function is intended only for separately allocated blk-mq queues.
This saves an extra queue freeze for devices without a separately
allocated queue.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20220619060552.1850436-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/gdrom.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 8e78b37d0f6a..f4cc90ea6198 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -831,7 +831,6 @@ probe_fail_no_mem: static int remove_gdrom(struct platform_device *devptr) { - blk_cleanup_queue(gd.gdrom_rq); blk_mq_free_tag_set(&gd.tag_set); free_irq(HW_EVENT_GDROM_CMD, &gd); free_irq(HW_EVENT_GDROM_DMA, &gd); |