Commit 04c170f6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

nvme: rename nvme_validate_or_alloc_ns to nvme_scan_ns

This shorter name much better fits what this function does in
the scanning process.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJavier González <javier.gonz@samsung.com>
Reviewed-by: default avatarJoel Granados <j.granados@samsung.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e06b425b
...@@ -4284,7 +4284,7 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids) ...@@ -4284,7 +4284,7 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids)
nvme_ns_remove(ns); nvme_ns_remove(ns);
} }
static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) static void nvme_scan_ns(struct nvme_ctrl *ctrl, unsigned nsid)
{ {
struct nvme_ns_ids ids = { }; struct nvme_ns_ids ids = { };
struct nvme_id_ns_cs_indep *id; struct nvme_id_ns_cs_indep *id;
...@@ -4392,7 +4392,7 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl) ...@@ -4392,7 +4392,7 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl)
if (!nsid) /* end of the list? */ if (!nsid) /* end of the list? */
goto out; goto out;
nvme_validate_or_alloc_ns(ctrl, nsid); nvme_scan_ns(ctrl, nsid);
while (++prev < nsid) while (++prev < nsid)
nvme_ns_remove_by_nsid(ctrl, prev); nvme_ns_remove_by_nsid(ctrl, prev);
} }
...@@ -4415,7 +4415,7 @@ static void nvme_scan_ns_sequential(struct nvme_ctrl *ctrl) ...@@ -4415,7 +4415,7 @@ static void nvme_scan_ns_sequential(struct nvme_ctrl *ctrl)
kfree(id); kfree(id);
for (i = 1; i <= nn; i++) for (i = 1; i <= nn; i++)
nvme_validate_or_alloc_ns(ctrl, i); nvme_scan_ns(ctrl, i);
nvme_remove_invalid_namespaces(ctrl, nn); nvme_remove_invalid_namespaces(ctrl, nn);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment