diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-02-24 10:57:15 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-02-28 13:45:06 +0200 |
| commit | fd8099e7918cd2df39ef306dd1d1af7178a15b81 (patch) | |
| tree | c2f5fd574a46f8f8b588aafca860705c353f7dfa /drivers/nvme | |
| parent | 0a9f850061d9126b9a4aaf56ae1810138cac0f51 (diff) | |
| download | linux-stable-fd8099e7918cd2df39ef306dd1d1af7178a15b81.tar.gz linux-stable-fd8099e7918cd2df39ef306dd1d1af7178a15b81.tar.bz2 linux-stable-fd8099e7918cd2df39ef306dd1d1af7178a15b81.zip | |
nvme: cleanup __nvme_check_ids
Pass the actual nvme_ns_ids used for the comparison instead of the
ns_head that isn't needed and use a more descriptive function name.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 9cffc4770e73..076a03b801b7 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3673,16 +3673,15 @@ static struct nvme_ns_head *nvme_find_ns_head(struct nvme_subsystem *subsys, return NULL; } -static int __nvme_check_ids(struct nvme_subsystem *subsys, - struct nvme_ns_head *new) +static int nvme_subsys_check_duplicate_ids(struct nvme_subsystem *subsys, + struct nvme_ns_ids *ids) { struct nvme_ns_head *h; lockdep_assert_held(&subsys->lock); list_for_each_entry(h, &subsys->nsheads, entry) { - if (nvme_ns_ids_valid(&new->ids) && - nvme_ns_ids_equal(&new->ids, &h->ids)) + if (nvme_ns_ids_valid(ids) && nvme_ns_ids_equal(ids, &h->ids)) return -EINVAL; } @@ -3781,7 +3780,7 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl, head->ids = *ids; kref_init(&head->ref); - ret = __nvme_check_ids(ctrl->subsys, head); + ret = nvme_subsys_check_duplicate_ids(ctrl->subsys, &head->ids); if (ret) { dev_err(ctrl->device, "duplicate IDs for nsid %d\n", nsid); |