From: Jens Axboe Date: Fri, 30 Sep 2022 13:47:38 +0000 (-0600) Subject: Merge branch 'for-6.1/block' into for-6.1/passthrough X-Git-Tag: v6.1-rc5~282^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=736feaa3a08124020afe6e51f50bae8598c99f55;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'for-6.1/block' into for-6.1/passthrough * for-6.1/block: (162 commits) sbitmap: fix lockup while swapping block: add rationale for not using blk_mq_plug() when applicable block: adapt blk_mq_plug() to not plug for writes that require a zone lock s390/dasd: use blk_mq_alloc_disk blk-cgroup: don't update the blkg lookup hint in blkg_conf_prep nvmet: don't look at the request_queue in nvmet_bdev_set_limits nvmet: don't look at the request_queue in nvmet_bdev_zone_mgmt_emulate_all blk-mq: use quiesced elevator switch when reinitializing queues block: replace blk_queue_nowait with bdev_nowait nvme: remove nvme_ctrl_init_connect_q nvme-loop: use the tagset alloc/free helpers nvme-loop: store the generic nvme_ctrl in set->driver_data nvme-loop: initialize sqsize later nvme-fc: use the tagset alloc/free helpers nvme-fc: store the generic nvme_ctrl in set->driver_data nvme-fc: keep ctrl->sqsize in sync with opts->queue_size nvme-rdma: use the tagset alloc/free helpers nvme-rdma: store the generic nvme_ctrl in set->driver_data nvme-tcp: use the tagset alloc/free helpers nvme-tcp: store the generic nvme_ctrl in set->driver_data ... Signed-off-by: Jens Axboe --- 736feaa3a08124020afe6e51f50bae8598c99f55 diff --cc block/genhd.c index 988ba52,d6a2180..5143953 --- a/block/genhd.c +++ b/block/genhd.c @@@ -625,9 -626,7 +625,9 @@@ 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_throtl_cancel_bios(disk); blk_sync_queue(q); blk_flush_integrity();