fabrics: rename nvme_free_uri to nvmf_free_uri

igaw · igaw · commit 82967b934360 · 2026-03-04T16:45:10.000+01:00
All fabrics function should use the nvmf_ prefix.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/libnvme/src/libnvme.ld b/libnvme/src/libnvme.ld
@@ -69,7 +69,6 @@ LIBNVME_2_0 {
 		nvme_free_host;
 		nvme_free_ns;
 		nvme_free_subsystem;
-		nvme_free_uri;
 		nvme_fw_download_seq;
 		nvme_gen_dhchap_key;
 		nvme_generate_tls_key_identity;
@@ -320,6 +319,7 @@ LIBNVME_2_0 {
 		nvmf_discovery_nbft;
 		nvmf_eflags_str;
 		nvmf_exat_ptr_next;
+		nvmf_free_uri;
 		nvmf_get_default_trsvcid;
 		nvmf_get_discovery_log;
 		nvmf_get_discovery_wargs;
diff --git a/libnvme/src/nvme/cleanup.h b/libnvme/src/nvme/cleanup.h
@@ -49,7 +49,7 @@ static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddri
 static inline void free_uri(struct nvme_fabrics_uri **uri)
 {
 	if (*uri)
-		nvme_free_uri(*uri);
+		nvmf_free_uri(*uri);
 }
 #define _cleanup_uri_ __cleanup__(free_uri)
 
diff --git a/libnvme/src/nvme/fabrics.c b/libnvme/src/nvme/fabrics.c
@@ -1962,13 +1962,13 @@ int nvme_parse_uri(const char *str, struct nvme_fabrics_uri **urip)
 
 	if (sscanf(str, "%m[^:/]://%m[^/?#]%ms",
 		   &scheme, &authority, &path) < 2) {
-		nvme_free_uri(uri);
+		nvmf_free_uri(uri);
 		return -EINVAL;
 	}
 
 	if (sscanf(scheme, "%m[^+]+%ms",
 		   &uri->scheme, &uri->protocol) < 1) {
-		nvme_free_uri(uri);
+		nvmf_free_uri(uri);
 		return -EINVAL;
 	}
 
@@ -1986,7 +1986,7 @@ int nvme_parse_uri(const char *str, struct nvme_fabrics_uri **urip)
 		/* treat it as IPv4/hostname */
 		if (sscanf(host, "%m[^:]:%d",
 			   &h, &uri->port) < 1) {
-			nvme_free_uri(uri);
+			nvmf_free_uri(uri);
 			return -EINVAL;
 		}
 		uri->host = unescape_uri(h, 0);
@@ -2030,7 +2030,7 @@ int nvme_parse_uri(const char *str, struct nvme_fabrics_uri **urip)
 	return 0;
 }
 
-void nvme_free_uri(struct nvme_fabrics_uri *uri)
+void nvmf_free_uri(struct nvme_fabrics_uri *uri)
 {
 	char **s;
 
diff --git a/libnvme/src/nvme/fabrics.h b/libnvme/src/nvme/fabrics.h
@@ -380,12 +380,12 @@ int nvmf_register_ctrl(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u32 *result);
 int nvme_parse_uri(const char *str, struct nvme_fabrics_uri **uri);
 
 /**
- * nvme_free_uri() - Free the URI structure
+ * nvmf_free_uri() - Free the URI structure
  * @uri:	&nvme_fabrics_uri structure
  *
  * Free an &nvme_fabrics_uri structure.
  */
-void nvme_free_uri(struct nvme_fabrics_uri *uri);
+void nvmf_free_uri(struct nvme_fabrics_uri *uri);
 
 /**
  * nvmf_get_default_trsvcid() - Get default transport service ID
diff --git a/libnvme/test/uriparser.c b/libnvme/test/uriparser.c
@@ -191,7 +191,7 @@ static void test_uriparser(void)
 			assert(strcmp(d->frag, parsed_data->fragment) == 0);
 		} else
 			assert(d->frag == parsed_data->fragment);
-		nvme_free_uri(parsed_data);
+		nvmf_free_uri(parsed_data);
 		printf("  OK\n");
 	}
 }
diff --git a/util/cleanup.h b/util/cleanup.h
@@ -48,7 +48,7 @@ static inline DEFINE_CLEANUP_FUNC(cleanup_nvme_ctrl, nvme_ctrl_t, nvme_free_ctrl
 static inline void free_uri(struct nvme_fabrics_uri **uri)
 {
 	if (*uri)
-		nvme_free_uri(*uri);
+		nvmf_free_uri(*uri);
 }
 #define _cleanup_uri_ __cleanup__(free_uri)
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddri`
`49`	`49`	`static inline void free_uri(struct nvme_fabrics_uri **uri)`
`50`	`50`	`{`
`51`	`51`	`if (*uri)`
`52`		`- nvme_free_uri(*uri);`
	`52`	`+ nvmf_free_uri(*uri);`
`53`	`53`	`}`
`54`	`54`	`#define _cleanup_uri_ __cleanup__(free_uri)`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -1962,13 +1962,13 @@ int nvme_parse_uri(const char str, struct nvme_fabrics_uri *urip)`
`1962`	`1962`
`1963`	`1963`	`if (sscanf(str, "%m[^:/]://%m[^/?#]%ms",`
`1964`	`1964`	`&scheme, &authority, &path) < 2) {`
`1965`		`- nvme_free_uri(uri);`
	`1965`	`+ nvmf_free_uri(uri);`
`1966`	`1966`	`return -EINVAL;`
`1967`	`1967`	`}`
`1968`	`1968`
`1969`	`1969`	`if (sscanf(scheme, "%m[^+]+%ms",`
`1970`	`1970`	`&uri->scheme, &uri->protocol) < 1) {`
`1971`		`- nvme_free_uri(uri);`
	`1971`	`+ nvmf_free_uri(uri);`
`1972`	`1972`	`return -EINVAL;`
`1973`	`1973`	`}`
`1974`	`1974`
`@@ -1986,7 +1986,7 @@ int nvme_parse_uri(const char str, struct nvme_fabrics_uri *urip)`
`1986`	`1986`	`/* treat it as IPv4/hostname */`
`1987`	`1987`	`if (sscanf(host, "%m[^:]:%d",`
`1988`	`1988`	`&h, &uri->port) < 1) {`
`1989`		`- nvme_free_uri(uri);`
	`1989`	`+ nvmf_free_uri(uri);`
`1990`	`1990`	`return -EINVAL;`
`1991`	`1991`	`}`
`1992`	`1992`	`uri->host = unescape_uri(h, 0);`
`@@ -2030,7 +2030,7 @@ int nvme_parse_uri(const char str, struct nvme_fabrics_uri *urip)`
`2030`	`2030`	`return 0;`
`2031`	`2031`	`}`
`2032`	`2032`
`2033`		`-void nvme_free_uri(struct nvme_fabrics_uri *uri)`
	`2033`	`+void nvmf_free_uri(struct nvme_fabrics_uri *uri)`
`2034`	`2034`	`{`
`2035`	`2035`	`char **s;`
`2036`	`2036`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ static void test_uriparser(void)`
`191`	`191`	`assert(strcmp(d->frag, parsed_data->fragment) == 0);`
`192`	`192`	`} else`
`193`	`193`	`assert(d->frag == parsed_data->fragment);`
`194`		`- nvme_free_uri(parsed_data);`
	`194`	`+ nvmf_free_uri(parsed_data);`
`195`	`195`	`printf(" OK\n");`
`196`	`196`	`}`
`197`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static inline DEFINE_CLEANUP_FUNC(cleanup_nvme_ctrl, nvme_ctrl_t, nvme_free_ctrl`
`48`	`48`	`static inline void free_uri(struct nvme_fabrics_uri **uri)`
`49`	`49`	`{`
`50`	`50`	`if (*uri)`
`51`		`- nvme_free_uri(*uri);`
	`51`	`+ nvmf_free_uri(*uri);`
`52`	`52`	`}`
`53`	`53`	`#define _cleanup_uri_ __cleanup__(free_uri)`
`54`	`54`