xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: cleanup __nvme_check_ids

Browse Source 
[ 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>
This commit is contained in:
Christoph Hellwig
2022-02-24 10:57:15 +01:00
committed by Greg Kroah-Hartman
parent 32c4db2a52
commit 40b288a861
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/nvme/host/core.c
View File

@@ -3681,16 +3681,15 @@ static struct nvme_ns_head *nvme_find_ns_head(struct nvme_subsystem *subsys,
return NULL; return NULL;
} }
static int __nvme_check_ids(struct nvme_subsystem *subsys, static int nvme_subsys_check_duplicate_ids(struct nvme_subsystem *subsys,
struct nvme_ns_head *new) struct nvme_ns_ids *ids)
{ {
struct nvme_ns_head *h; struct nvme_ns_head *h;
lockdep_assert_held(&subsys->lock); lockdep_assert_held(&subsys->lock);
list_for_each_entry(h, &subsys->nsheads, entry) { list_for_each_entry(h, &subsys->nsheads, entry) {
if (nvme_ns_ids_valid(&new->ids) && if (nvme_ns_ids_valid(ids) && nvme_ns_ids_equal(ids, &h->ids))
nvme_ns_ids_equal(&new->ids, &h->ids))
return -EINVAL; return -EINVAL;
} }
@@ -3724,7 +3723,7 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl,
head->ids = *ids; head->ids = *ids;
kref_init(&head->ref); kref_init(&head->ref);
ret = __nvme_check_ids(ctrl->subsys, head); ret = nvme_subsys_check_duplicate_ids(ctrl->subsys, &head->ids);
if (ret) { if (ret) {
dev_err(ctrl->device, dev_err(ctrl->device,
"duplicate IDs for nsid %d\n", nsid); "duplicate IDs for nsid %d\n", nsid);