libnvme: make __nvme_lookup_ctrl() static

Replace with nvme_ctrl_find() and make it static to avoid
function name clashes.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

libnvme/src/nvme/fabrics.c

@@ -976,7 +976,7 @@ static const char *lookup_context(struct nvme_global_ctx *ctx, nvme_ctrl_t c)
 				.trsvcid = nvme_ctrl_get_trsvcid(c),
 				.subsysnqn = NULL,
 			};
-			if (__nvme_lookup_ctrl(s, &fctx, NULL))
+			if (nvme_ctrl_find(s, &fctx))
 				return nvme_subsystem_get_application(s);
 		}
 	}
@@ -1008,7 +1008,7 @@ __public int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 			.subsysnqn = NULL,
 		};
 
-		fc = __nvme_lookup_ctrl(s, &fctx, NULL);
+		fc = nvme_ctrl_find(s, &fctx);
 		if (fc) {
 			const char *key;
 

libnvme/src/nvme/private.h

@@ -384,9 +384,6 @@ void __nvme_transport_handle_close_mi(struct nvme_transport_handle *hdl);
 int _nvme_create_ctrl(struct nvme_global_ctx *ctx,
 		      struct nvmf_context *fctx,
 		      nvme_ctrl_t *cp);
-nvme_ctrl_t __nvme_lookup_ctrl(nvme_subsystem_t s,
-			       struct nvmf_context *fctx,
-			       nvme_ctrl_t p);
 bool _nvme_ctrl_match_config(struct nvme_ctrl *c, struct nvmf_context *fctx);
 
 void *__nvme_alloc(size_t len);

libnvme/src/nvme/tree.c

@@ -1451,8 +1451,9 @@ static ctrl_match_t _candidate_init(struct nvme_global_ctx *ctx,
 	return _match_ctrl;
 }
 
-nvme_ctrl_t __nvme_lookup_ctrl(nvme_subsystem_t s, struct nvmf_context *fctx,
-			       nvme_ctrl_t p)
+static nvme_ctrl_t __nvme_lookup_ctrl(nvme_subsystem_t s,
+				      struct nvmf_context *fctx,
+				      nvme_ctrl_t p)
 {
 	struct candidate_args candidate = {};
 	struct nvme_ctrl *c, *matching_c = NULL;