Skip to content

Commit

Permalink
nvme-pci: add missing unlock for reset error
Browse files Browse the repository at this point in the history
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: 5c959d7 ("nvme-pci: fix rapid add remove sequence")
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Keith Busch authored and Christoph Hellwig committed Feb 12, 2019
1 parent aef1897 commit 4726bcf
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/nvme/host/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 4726bcf

Please sign in to comment.