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

nvme: rename nvme_validate_ns to nvme_validate_or_alloc_ns 



Use a slightly more descriptive name to enable reusing nvme_validate_ns
in the next patch for a lower level function.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
parent d525c3c0

drivers/nvme/host/core.c

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

}