| From cd6867f630a894b447b61b3c8d7ed6a390d76a8e Mon Sep 17 00:00:00 2001 |
| From: Keith Busch <keith.busch@intel.com> |
| Date: Mon, 11 Feb 2019 09:23:50 -0700 |
| Subject: nvme-pci: add missing unlock for reset error |
| |
| [ Upstream commit 4726bcf30fad37cc555cd9dcd6c73f2b2668c879 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/nvme/host/pci.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c |
| index 6398ffbce6de..7b9ef8e734e7 100644 |
| --- a/drivers/nvme/host/pci.c |
| +++ b/drivers/nvme/host/pci.c |
| @@ -2263,15 +2263,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 |
| @@ -2354,6 +2354,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); |
| } |
| -- |
| 2.19.1 |
| |
