diff options
| author | Israel Rukshin <israelr@mellanox.com> | 2020-03-24 17:29:42 +0200 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2020-03-26 04:51:56 +0900 |
| commit | 726612b6b8259afa41d265a2722991c87f059223 (patch) | |
| tree | aa2a91b5b655fa4a4feb1f4250bf68b97eeb8de0 /drivers/nvme/host/fc.c | |
| parent | b780d7415aacec855e2f2370cbf98f918b224903 (diff) | |
| download | linux-726612b6b8259afa41d265a2722991c87f059223.tar.gz linux-726612b6b8259afa41d265a2722991c87f059223.tar.bz2 linux-726612b6b8259afa41d265a2722991c87f059223.zip | |
nvme: Make nvme_uninit_ctrl symmetric to nvme_init_ctrl
Put the ctrl reference count at nvme_uninit_ctrl as opposed to
nvme_init_ctrl which takes it. This decrease the reference count at the
core layer instead of decreasing it on each transport separately.
Also move the call of nvme_uninit_ctrl at PCI driver after calling to
nvme_release_prp_pools and nvme_dev_unmap, in order to put the reference
count after using the dev. This is safe because those functions use
nvme_dev which is freed only later at nvme_pci_free_ctrl.
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme/host/fc.c')
| -rw-r--r-- | drivers/nvme/host/fc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 59d2e2bec179..a8bf2fb1287b 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3206,7 +3206,6 @@ fail_ctrl: /* initiate nvme ctrl ref counting teardown */ nvme_uninit_ctrl(&ctrl->ctrl); - nvme_put_ctrl(&ctrl->ctrl); /* Remove core ctrl ref. */ nvme_put_ctrl(&ctrl->ctrl); |