fabris: add nvmf_context_free

Introduce function to release all resource associated to a fabrics
context. This allows makes the opaque data structure more useful inside
the library.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

fabrics.c

@@ -389,7 +389,7 @@ static int create_common_context(struct nvme_global_ctx *ctx,
 	return 0;
 
 err:
-	free(fctx);
+	nvmf_context_free(fctx);
 	return err;
 }
 
@@ -425,7 +425,7 @@ static int create_discovery_context(struct nvme_global_ctx *ctx,
 	return 0;
 
 err:
-	free(fctx);
+	nvmf_context_free(fctx);
 	return err;
 }
 
@@ -480,7 +480,7 @@ int fabrics_discovery(const char *desc, int argc, char **argv, bool connect)
 	char *context = NULL;
 	nvme_print_flags_t flags;
 	_cleanup_nvme_global_ctx_ struct nvme_global_ctx *ctx = NULL;
-	_cleanup_free_ struct nvmf_context *fctx = NULL;
+	_cleanup_nvmf_context_ struct nvmf_context *fctx = NULL;
 	int ret;
 	struct nvme_fabrics_config cfg;
 	struct nvmf_args fa = { .subsysnqn = NVME_DISC_SUBSYS_NAME };
@@ -592,7 +592,7 @@ int fabrics_connect(const char *desc, int argc, char **argv)
 	char *config_file = NULL;
 	char *context = NULL;
 	_cleanup_nvme_global_ctx_ struct nvme_global_ctx *ctx = NULL;
-	_cleanup_free_ struct nvmf_context *fctx = NULL;
+	_cleanup_nvmf_context_ struct nvmf_context *fctx = NULL;
 	_cleanup_nvme_ctrl_ nvme_ctrl_t c = NULL;
 	int ret;
 	nvme_print_flags_t flags;
@@ -931,7 +931,7 @@ int fabrics_config(const char *desc, int argc, char **argv)
 	}
 
 	if (modify_config) {
-		_cleanup_free_ struct nvmf_context *fctx = NULL;
+		_cleanup_nvmf_context_ struct nvmf_context *fctx = NULL;
 
 		if (!fa.subsysnqn) {
 			fprintf(stderr,

libnvme/src/libnvmf.ld

@@ -10,6 +10,7 @@ LIBNVMF_3 {
 		nvmf_connect_config_json;
 		nvmf_connect_ctrl;
 		nvmf_context_create;
+		nvmf_context_free;
 		nvmf_context_set_connection;
 		nvmf_context_set_crypto;
 		nvmf_context_set_device;

libnvme/src/nvme/fabrics.c

@@ -214,6 +214,11 @@ __public int nvmf_context_create(struct nvme_global_ctx *ctx,
 	return 0;
 }
 
+__public void nvmf_context_free(struct nvmf_context *fctx)
+{
+	free(fctx);
+}
+
 __public int nvmf_context_set_discovery_cbs(struct nvmf_context *fctx,
 		void (*discovery_log)(struct nvmf_context *fctx,
 			bool connect,

libnvme/src/nvme/fabrics.h

@@ -381,6 +381,17 @@ int nvmf_context_create(struct nvme_global_ctx *ctx,
 			const char *trsvcid, void *user_data),
 		void *user_data, struct nvmf_context **fctxp);
 
+/**
+ * nvmf_context_free() - Free a fabrics context
+ * @fctx: Fabrics context to free
+ *
+ * Releases all resources associated with @fctx. The context must have
+ * been previously created with nvmf_context_create().
+ *
+ * After this call, @fctx must not be used.
+ */
+void nvmf_context_free(struct nvmf_context *fctx);
+
 /**
  * nvmf_context_set_discovery_cbs() - Set discovery callbacks for context
  * @fctx: Fabrics context

util/cleanup.h

@@ -52,6 +52,12 @@ static inline void free_uri(struct nvme_fabrics_uri **uri)
 		nvmf_free_uri(*uri);
 }
 #define _cleanup_uri_ __cleanup__(free_uri)
+
+static inline void cleanup_nvmf_context(struct nvmf_context **fctx)
+{
+	nvmf_context_free(*fctx);
+}
+#define _cleanup_nvmf_context_ __cleanup__(cleanup_nvmf_context)
 #endif
 
 static inline DEFINE_CLEANUP_FUNC(cleanup_file, FILE *, fclose)