nvme: cleanup __nvme_check_ids

[ Upstream commit fd8099e7918cd2df39ef306dd1d1af7178a15b81 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d5d5d035d67757e163137ae7659d7bc8245d1ea9..e06d6026e7fa2e5d2c7b8524bd170f70d8f594b4 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3534,16 +3534,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;
        }
 
@@ -3642,7 +3641,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);