diff options
| author | Keith Busch <keith.busch@intel.com> | 2019-02-11 09:23:50 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-02-12 09:29:07 +0100 |
| commit | 4726bcf30fad37cc555cd9dcd6c73f2b2668c879 (patch) | |
| tree | 66f8d7cd04f0b7a8eac338d708a42f077d1e54c2 /drivers/nvme | |
| parent | aef1897cd36dcf5e296f1d2bae7e0d268561b685 (diff) | |
| download | linux-4726bcf30fad37cc555cd9dcd6c73f2b2668c879.tar.gz linux-4726bcf30fad37cc555cd9dcd6c73f2b2668c879.tar.bz2 linux-4726bcf30fad37cc555cd9dcd6c73f2b2668c879.zip | |
nvme-pci: add missing unlock for reset error
The reset work holds a mutex to prevent races with removal modifying the
same resources, but was unlocking only on success. Unlock on failure
too.
Fixes: 5c959d73dba64 ("nvme-pci: fix rapid add remove sequence")
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 022ea1ee63f8..7fee665ec45e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2560,15 +2560,15 @@ static void nvme_reset_work(struct work_struct *work) mutex_lock(&dev->shutdown_lock); result = nvme_pci_enable(dev); if (result) - goto out; + goto out_unlock; result = nvme_pci_configure_admin_queue(dev); if (result) - goto out; + goto out_unlock; result = nvme_alloc_admin_tags(dev); if (result) - goto out; + goto out_unlock; /* * Limit the max command size to prevent iod->sg allocations going @@ -2651,6 +2651,8 @@ static void nvme_reset_work(struct work_struct *work) nvme_start_ctrl(&dev->ctrl); return; + out_unlock: + mutex_unlock(&dev->shutdown_lock); out: nvme_remove_dead_ctrl(dev, result); } |