Removed cleanup.h dependency on private.h to match upstream.

Removed __libnvme_free from private.h. It was only used by fabrics, which isn't supported on Windows, and in cleanup.h.  Removed __libnvme_free implementation from util.c  Directly calling aligned_free instead.

This allows us to get rid of the private.h include in cleanup.h, better matching the recent upstream refactoring.

Author: bgoing-micron-oss

libnvme/src/nvme/cleanup.h

@@ -4,8 +4,6 @@
 
 #include <stdlib.h>
 
-#include "private.h"	/* for __libnvme_free */
-
 #define __cleanup(fn) __attribute__((cleanup(fn)))
 
 #define DECLARE_CLEANUP_FUNC(name, type) \
@@ -26,7 +24,7 @@ static inline void freep(void *p)
 
 static inline void nvme_freep(void *p)
 {
-	__libnvme_free(*(void **)p);
+	aligned_free(*(void **)p);
 }
 #define __cleanup_nvme_free __cleanup(nvme_freep)
 

libnvme/src/nvme/fabrics.c

@@ -1415,7 +1415,7 @@ static int nvme_discovery_log(libnvme_ctrl_t ctrl,
 		if (numrec == 0)
 			break;
 
-		__libnvme_free(log);
+		free(log);
 		entries_size = sizeof(*log->entries) * numrec;
 		log = __libnvme_alloc(sizeof(*log) + entries_size);
 		if (!log) {
@@ -1472,7 +1472,7 @@ static int nvme_discovery_log(libnvme_ctrl_t ctrl,
 	}
 
 out_free_log:
-	__libnvme_free(log);
+	free(log);
 	return err;
 }
 
@@ -1784,7 +1784,7 @@ static const char *dctype_str[] = {
  */
 static int nvme_fetch_cntrltype_dctype_from_id(libnvme_ctrl_t c)
 {
-	__cleanup_nvme_free struct nvme_id_ctrl *id = NULL;
+	__cleanup_free struct nvme_id_ctrl *id = NULL;
 	int ret;
 
 	id = __libnvme_alloc(sizeof(*id));
@@ -2255,7 +2255,7 @@ static int nvmf_create_discovery_ctrl(struct libnvme_global_ctx *ctx,
 		struct libnvmf_context *fctx, libnvme_host_t h,
 		struct libnvme_ctrl **ctrl)
 {
-	__cleanup_nvme_free struct nvme_id_ctrl *id = NULL;
+	__cleanup_free struct nvme_id_ctrl *id = NULL;
 	struct libnvme_ctrl *c;
 	int ret;
 

libnvme/src/nvme/private.h

@@ -380,8 +380,6 @@ void *__libnvme_alloc(size_t len);
 
 void *__libnvme_realloc(void *p, size_t len);
 
-void __libnvme_free(void *p);
-
 void nvme_deconfigure_ctrl(struct libnvme_ctrl *c);
 
 struct libnvme_host *libnvme_lookup_host(struct libnvme_global_ctx *ctx,

libnvme/src/nvme/util.c

@@ -1028,17 +1028,12 @@ void *__libnvme_realloc(void *p, size_t len)
 
 	if (p && result) {
 		memcpy(result, p, min(old_len, len));
-		__libnvme_free(p);
+		aligned_free(p);
 	}
 
 	return result;
 }
 
-void __libnvme_free(void *p)
-{
-	aligned_free(p);
-}
-
 #ifdef CONFIG_FABRICS
 const struct ifaddrs *libnvme_getifaddrs(struct libnvme_global_ctx *ctx)
 {