nvme: rename nvme_validate_ns to nvme_validate_or_alloc_ns
authorChristoph Hellwig <hch@lst.de>
Mon, 28 Sep 2020 07:42:17 +0000 (09:42 +0200)
committerChristoph Hellwig <hch@lst.de>
Wed, 7 Oct 2020 05:56:17 +0000 (07:56 +0200)
Use a slightly more descriptive name to enable reusing nvme_validate_ns
in the next patch for a lower level function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
drivers/nvme/host/core.c

index d4b5032..c5f2615 100644 (file)
@@ -4021,7 +4021,7 @@ static void nvme_ns_remove_by_nsid(struct nvme_ctrl *ctrl, u32 nsid)
        }
 }
 
-static void nvme_validate_ns(struct nvme_ctrl *ctrl, unsigned nsid)
+static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 {
        struct nvme_ns *ns;
        int ret;
@@ -4083,7 +4083,7 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl)
 
                        if (!nsid)      /* end of the list? */
                                goto out;
-                       nvme_validate_ns(ctrl, nsid);
+                       nvme_validate_or_alloc_ns(ctrl, nsid);
                        while (++prev < nsid)
                                nvme_ns_remove_by_nsid(ctrl, prev);
                }
@@ -4106,7 +4106,7 @@ static void nvme_scan_ns_sequential(struct nvme_ctrl *ctrl)
        kfree(id);
 
        for (i = 1; i <= nn; i++)
-               nvme_validate_ns(ctrl, i);
+               nvme_validate_or_alloc_ns(ctrl, i);
 
        nvme_remove_invalid_namespaces(ctrl, nn);
 }