提交 7066774e 编写于 作者: K Keith Busch 提交者: Greg Kroah-Hartman

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: NKeith Busch <keith.busch@intel.com>
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NSasha Levin <sashal@kernel.org>
上级 6d482bc5
...@@ -2263,15 +2263,15 @@ static void nvme_reset_work(struct work_struct *work) ...@@ -2263,15 +2263,15 @@ static void nvme_reset_work(struct work_struct *work)
mutex_lock(&dev->shutdown_lock); mutex_lock(&dev->shutdown_lock);
result = nvme_pci_enable(dev); result = nvme_pci_enable(dev);
if (result) if (result)
goto out; goto out_unlock;
result = nvme_pci_configure_admin_queue(dev); result = nvme_pci_configure_admin_queue(dev);
if (result) if (result)
goto out; goto out_unlock;
result = nvme_alloc_admin_tags(dev); result = nvme_alloc_admin_tags(dev);
if (result) if (result)
goto out; goto out_unlock;
/* /*
* Limit the max command size to prevent iod->sg allocations going * Limit the max command size to prevent iod->sg allocations going
...@@ -2354,6 +2354,8 @@ static void nvme_reset_work(struct work_struct *work) ...@@ -2354,6 +2354,8 @@ static void nvme_reset_work(struct work_struct *work)
nvme_start_ctrl(&dev->ctrl); nvme_start_ctrl(&dev->ctrl);
return; return;
out_unlock:
mutex_unlock(&dev->shutdown_lock);
out: out:
nvme_remove_dead_ctrl(dev, result); nvme_remove_dead_ctrl(dev, result);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册