diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-06 12:04:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-06 12:04:06 -0700 |
| commit | b66f0b119c96dbb6b976f1d75b7bf69960069bde (patch) | |
| tree | c53a3213480e1d274b3809d0c6c3fc5a90ee6045 /drivers/block | |
| parent | 703896be3015db7f8fd8822b18909a5914209a70 (diff) | |
| parent | 4ba032bc71dad8d604d308afffaa16b81816c751 (diff) | |
| download | lwn-b66f0b119c96dbb6b976f1d75b7bf69960069bde.tar.gz lwn-b66f0b119c96dbb6b976f1d75b7bf69960069bde.zip | |
Merge tag 'block-6.11-20240906' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Mostly just some fixlets for NVMe, but also a bug fix for the ublk
driver and an integrity fix"
* tag 'block-6.11-20240906' of git://git.kernel.dk/linux:
bio-integrity: don't restrict the size of integrity metadata
ublk_drv: fix NULL pointer dereference in ublk_ctrl_start_recovery()
nvmet: Identify-Active Namespace ID List command should reject invalid nsid
nvme: set BLK_FEAT_ZONED for ZNS multipath disks
nvme-pci: Add sleep quirk for Samsung 990 Evo
nvme-pci: allocate tagset on reset if necessary
nvmet-tcp: fix kernel crash if commands allocation fails
nvme: use better description for async reset reason
nvmet: Make nvmet_debugfs static
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ublk_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 890c08792ba8..1d53a3f48a0e 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -2663,6 +2663,8 @@ static int ublk_ctrl_start_recovery(struct ublk_device *ub, mutex_lock(&ub->mutex); if (!ublk_can_use_recovery(ub)) goto out_unlock; + if (!ub->nr_queues_ready) + goto out_unlock; /* * START_RECOVERY is only allowd after: * |