lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0235/1126] nvme: cleanup __nvme_check_ids
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ 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>
    ---
    drivers/nvme/host/core.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index fd4720d37cc0..f921c917f4b0 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -3598,16 +3598,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;
    }

    @@ -3706,7 +3705,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);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 10:10    [W:3.722 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site