diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-24 08:22:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-24 08:22:53 -0700 |
| commit | 0be27f7be2e5def5577de097fb420af09acf0983 (patch) | |
| tree | 6bf46aee25ce69a1187472d313a3d5b90c9389eb /block | |
| parent | a63f2e7cb1107ab124f80407e5eb8579c04eb7a9 (diff) | |
| parent | 4c66a326b5ab784cddd72de07ac5b6210e9e1b06 (diff) | |
| download | linux-0be27f7be2e5def5577de097fb420af09acf0983.tar.gz linux-0be27f7be2e5def5577de097fb420af09acf0983.tar.bz2 linux-0be27f7be2e5def5577de097fb420af09acf0983.zip | |
Merge tag 'block-6.0-2022-09-22' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Fix a regression that's been plaguing us by reverting the offending
commit, as attempts to both reproduce the issue and fix it in a saner
fashion have failed.
Fix for a potential oops condition in the s390 dasd block driver"
* tag 'block-6.0-2022-09-22' of git://git.kernel.dk/linux:
Revert "block: freeze the queue earlier in del_gendisk"
s390/dasd: fix Oops in dasd_alias_get_start_dev due to missing pavgroup
Diffstat (limited to 'block')
| -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 d36fabf0abc1..988ba52fd331 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -602,7 +602,6 @@ void del_gendisk(struct gendisk *disk) * Prevent new I/O from crossing bio_queue_enter(). */ blk_queue_start_drain(q); - blk_mq_freeze_queue_wait(q); if (!(disk->flags & GENHD_FL_HIDDEN)) { sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi"); @@ -626,6 +625,8 @@ void del_gendisk(struct gendisk *disk) pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); device_del(disk_to_dev(disk)); + blk_mq_freeze_queue_wait(q); + blk_throtl_cancel_bios(disk->queue); blk_sync_queue(q); |