diff options
| author | Kanchan Joshi <joshi.k@samsung.com> | 2021-04-27 12:17:46 +0530 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2021-05-04 09:35:48 +0200 |
| commit | 4c74d1f80381996027bacc4f6c554948ef9bf374 (patch) | |
| tree | 5b54300b522e2cae1d173732a160d2f3d022f66f /drivers/nvme | |
| parent | 48145b62563a9ae1ad631d6b576c6b9a798fcbec (diff) | |
| download | linux-stable-4c74d1f80381996027bacc4f6c554948ef9bf374.tar.gz linux-stable-4c74d1f80381996027bacc4f6c554948ef9bf374.tar.bz2 linux-stable-4c74d1f80381996027bacc4f6c554948ef9bf374.zip | |
nvme: add nvme_get_ns helper
Add a helper to avoid opencoding ns->kref increment.
Decrement is already done via nvme_put_ns helper.
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c1c196459d79..f2d1f2d699b8 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -576,6 +576,11 @@ static void nvme_free_ns(struct kref *kref) kfree(ns); } +static inline bool nvme_get_ns(struct nvme_ns *ns) +{ + return kref_get_unless_zero(&ns->kref); +} + void nvme_put_ns(struct nvme_ns *ns) { kref_put(&ns->kref, nvme_free_ns); @@ -1494,7 +1499,7 @@ static int nvme_ns_open(struct nvme_ns *ns) /* should never be called due to GENHD_FL_HIDDEN */ if (WARN_ON_ONCE(nvme_ns_head_multipath(ns->head))) goto fail; - if (!kref_get_unless_zero(&ns->kref)) + if (!nvme_get_ns(ns)) goto fail; if (!try_module_get(ns->ctrl->ops->module)) goto fail_put_ns; @@ -3582,7 +3587,7 @@ struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid) down_read(&ctrl->namespaces_rwsem); list_for_each_entry(ns, &ctrl->namespaces, list) { if (ns->head->ns_id == nsid) { - if (!kref_get_unless_zero(&ns->kref)) + if (!nvme_get_ns(ns)) continue; ret = ns; break; |