diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-05-19 04:46:42 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-05-19 04:46:42 +0300 |
| commit | 1878b736e88e0d30f67d7fb577816395727ef040 (patch) | |
| tree | 9457e0781a711a0c691480cd9db32f5265ef73fc /drivers/nvme/host/multipath.c | |
| parent | ac5902f84bb546c64aea02c439c2579cbf40318f (diff) | |
| parent | 0649728123cf6a5518e154b4e1735fc85ea4f55c (diff) | |
| download | linux-1878b736e88e0d30f67d7fb577816395727ef040.tar.xz | |
Merge tag 'nvme-6.4-2023-05-18' of git://git.infradead.org/nvme into block-6.4
Pull NVMe fixes from Keith:
"nvme fixes for Linux 6.4
- More device quirks (Sagi, Hristo, Adrian, Daniel)
- Controller delete race (Maurizo)
- Multipath cleanup fix (Christoph)"
* tag 'nvme-6.4-2023-05-18' of git://git.infradead.org/nvme:
nvme-pci: Add quirk for Teamgroup MP33 SSD
nvme: do not let the user delete a ctrl before a complete initialization
nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk
nvme-pci: clamp max_hw_sectors based on DMA optimized limitation
nvme-pci: add quirk for missing secondary temperature thresholds
nvme-pci: add NVME_QUIRK_BOGUS_NID for HS-SSD-FUTURE 2048G
Diffstat (limited to 'drivers/nvme/host/multipath.c')
| -rw-r--r-- | drivers/nvme/host/multipath.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 9171452e2f6d..2bc159a318ff 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -884,7 +884,6 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) { if (!head->disk) return; - blk_mark_disk_dead(head->disk); /* make sure all pending bios are cleaned up */ kblockd_schedule_work(&head->requeue_work); flush_work(&head->requeue_work); |