diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-09-29 09:12:41 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-10-15 21:02:54 -0600 |
| commit | aec89dc5d421200b353d99a2bfff9e0967f67037 (patch) | |
| tree | cfecaf05ddb52c19550291145e7b7bb087744ffd /block/genhd.c | |
| parent | 8e141f9eb803e209714a80aa6ec073893f94c526 (diff) | |
| download | linux-stable-aec89dc5d421200b353d99a2bfff9e0967f67037.tar.gz linux-stable-aec89dc5d421200b353d99a2bfff9e0967f67037.tar.bz2 linux-stable-aec89dc5d421200b353d99a2bfff9e0967f67037.zip | |
block: keep q_usage_counter in atomic mode after del_gendisk
Don't switch back to percpu mode to avoid the double RCU grace period
when tearing down SCSI devices. After removing the disk only passthrough
commands can be send anyway.
Suggested-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20210929071241.934472-6-hch@lst.de
Tested-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index 1fe816be9bcd..7a766cc613c7 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -596,7 +596,8 @@ void del_gendisk(struct gendisk *disk) /* * Allow using passthrough request again after the queue is torn down. */ - blk_mq_unfreeze_queue(q); + blk_queue_flag_clear(QUEUE_FLAG_INIT_DONE, q); + __blk_mq_unfreeze_queue(q, true); if (!(disk->flags & GENHD_FL_HIDDEN)) { sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi"); |