Commit fd8099e7 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
parent 0a9f8500

drivers/nvme/host/core.c

+4 −5
Original line number Diff line number Diff line
@@ -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);