tree: add nvme_global_ctx to struct nvme_ns and struct nvme_ctrl

Add the global context to struct nvme_ns and struct nvme_ctrl, so it's
possible to access the context within the tree operations. This avoids
the need to add the global context pointer to every single function.
Only those which create the objects need it.

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

Author: igaw

libnvme/src/nvme/private.h

@@ -140,6 +140,7 @@ struct nvme_ns {
 	struct nvme_ctrl *c;
 	struct nvme_ns_head *head;
 
+	struct nvme_global_ctx *ctx;
 	struct nvme_transport_handle *hdl;
 	__u32 nsid;
 	char *name;
@@ -164,6 +165,7 @@ struct nvme_ctrl {
 	struct list_head namespaces;
 	struct nvme_subsystem *s;
 
+	struct nvme_global_ctx *ctx;
 	struct nvme_transport_handle *hdl;
 	char *name;
 	char *sysfs_dir;

libnvme/src/nvme/tree.c

@@ -1455,6 +1455,7 @@ int nvme_create_ctrl(struct nvme_global_ctx *ctx,
 	if (!c)
 		return -ENOMEM;
 
+	c->ctx = ctx;
 	c->hdl = NULL;
 	nvmf_default_config(&c->cfg);
 	list_head_init(&c->namespaces);
@@ -2771,7 +2772,8 @@ static void nvme_ns_set_generic_name(struct nvme_ns *n, const char *name)
 	n->generic_name = strdup(generic_name);
 }
 
-int nvme_ns_open(const char *sys_path, const char *name, nvme_ns_t *ns)
+static int nvme_ns_open(struct nvme_global_ctx *ctx, const char *sys_path,
+		const char *name, nvme_ns_t *ns)
 {
 	int ret;
 	struct nvme_ns *n;
@@ -2808,6 +2810,7 @@ int nvme_ns_open(const char *sys_path, const char *name, nvme_ns_t *ns)
 	} else
 		head->sysfs_dir = NULL;
 
+	n->ctx = ctx;
 	n->head = head;
 	n->hdl = NULL;
 	n->name = strdup(name);
@@ -2858,7 +2861,8 @@ static char *nvme_ns_generic_to_blkdev(const char *generic)
 	return strdup(blkdev);
 }
 
-static int __nvme_scan_namespace(const char *sysfs_dir, const char *name, nvme_ns_t *ns)
+static int __nvme_scan_namespace(struct nvme_global_ctx *ctx,
+		const char *sysfs_dir, const char *name, nvme_ns_t *ns)
 {
 	_cleanup_free_ char *blkdev = NULL;
 	_cleanup_free_ char *path = NULL;
@@ -2873,7 +2877,7 @@ static int __nvme_scan_namespace(const char *sysfs_dir, const char *name, nvme_n
 	if (ret < 0)
 		return -ENOMEM;
 
-	ret = nvme_ns_open(path, blkdev, &n);
+	ret = nvme_ns_open(ctx, path, blkdev, &n);
 	if (ret)
 		return ret;
 
@@ -2884,9 +2888,10 @@ static int __nvme_scan_namespace(const char *sysfs_dir, const char *name, nvme_n
 	return 0;
 }
 
-int nvme_scan_namespace(const char *name, nvme_ns_t *ns)
+int nvme_scan_namespace(struct nvme_global_ctx *ctx, const char *name,
+		nvme_ns_t *ns)
 {
-	return __nvme_scan_namespace(nvme_ns_sysfs_dir(), name, ns);
+	return __nvme_scan_namespace(ctx, nvme_ns_sysfs_dir(), name, ns);
 }
 
 
@@ -2966,7 +2971,7 @@ static int nvme_ctrl_scan_namespace(struct nvme_global_ctx *ctx, struct nvme_ctr
 		nvme_msg(ctx, LOG_DEBUG, "no subsystem for %s\n", name);
 		return -EINVAL;
 	}
-	ret = __nvme_scan_namespace(c->sysfs_dir, name, &n);
+	ret = __nvme_scan_namespace(ctx, c->sysfs_dir, name, &n);
 	if (ret) {
 		nvme_msg(ctx, LOG_DEBUG, "failed to scan namespace %s\n", name);
 		return ret;
@@ -2992,7 +2997,7 @@ static int nvme_subsystem_scan_namespace(struct nvme_global_ctx *ctx, nvme_subsy
 
 	nvme_msg(ctx, LOG_DEBUG, "scan subsystem %s namespace %s\n",
 		 s->name, name);
-	ret = __nvme_scan_namespace(s->sysfs_dir, name, &n);
+	ret = __nvme_scan_namespace(ctx, s->sysfs_dir, name, &n);
 	if (ret) {
 		nvme_msg(ctx, LOG_DEBUG, "failed to scan namespace %s\n", name);
 		return ret;

libnvme/src/nvme/tree.h

@@ -1493,12 +1493,14 @@ char *nvme_get_path_attr(nvme_path_t p, const char *attr);
 
 /**
  * nvme_scan_namespace() - scan namespace based on sysfs name
+ * @ctx:	&struct nvme_global_ctx object
  * @name:	sysfs name of the namespace to scan
  * @ns:		&nvme_ns_t object to return
  *
  * Return: 0 on success or negative error code otherwise
  */
-int nvme_scan_namespace(const char *name, nvme_ns_t *ns);
+int nvme_scan_namespace(struct nvme_global_ctx *ctx, const char *name,
+		nvme_ns_t *ns);
 
 /**
  * nvme_host_get_hostsymname() - Get the host's symbolic name

plugins/sandisk/sandisk-utils.c

@@ -48,7 +48,7 @@ int sndk_get_pci_ids(struct nvme_global_ctx *ctx, struct nvme_transport_handle *
 			nvme_ctrl_get_sysfs_dir(c));
 		nvme_free_ctrl(c);
 	} else {
-		ret = nvme_scan_namespace(name, &n);
+		ret = nvme_scan_namespace(ctx, name, &n);
 		if (!ret) {
 			fprintf(stderr, "Unable to find %s\n", name);
 			return ret;

plugins/solidigm/solidigm-get-drive-info.c

@@ -48,7 +48,8 @@ int sldgm_get_drive_info(int argc, char **argv, struct command *acmd, struct plu
 	if (!err)
 		n = nvme_ctrl_first_ns(c);
 	else {
-		err = nvme_scan_namespace(nvme_transport_handle_get_name(hdl), &n);
+		err = nvme_scan_namespace(ctx,
+			nvme_transport_handle_get_name(hdl), &n);
 		if (err) {
 			nvme_show_error("solidigm-vs-drive-info: drive missing namespace");
 			return err;

plugins/wdc/wdc-nvme.c

@@ -1490,7 +1490,7 @@ static int wdc_get_pci_ids(struct nvme_global_ctx *ctx, struct nvme_transport_ha
 			nvme_ctrl_get_sysfs_dir(c));
 		nvme_free_ctrl(c);
 	} else {
-		ret = nvme_scan_namespace(name, &n);
+		ret = nvme_scan_namespace(ctx, name, &n);
 		if (ret) {
 			fprintf(stderr, "Unable to find %s\n", name);
 			return ret;