tree: remove nvme_update_config

nvme_update_config is used to dump the current configuration to the
either stdout or a config file. There is also nvme_dump_config which
does almost the same thing. The only difference is that
nvme_update_config is testing if the something has been modified.

The modified tracking happens on a global level and almost all
operations on the tree will set the modified flag. This is actually not
really needed. nvme-cli uses for the 'config' command which expects
that the config is updated. One could argue that the config should not
be written when nothing changes. But this could be done in a different
way, e.g. create a temp config and compare it to the original and only
overwrite the original if something changes. But no one complained that
the config is overwritten all the time so far (remember the modified
flag is almost certainly always set).

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

Author: igaw

fabrics.c

@@ -579,7 +579,7 @@ int fabrics_discovery(const char *desc, int argc, char **argv, bool connect)
 
 out_free:
 	if (dump_config)
-		nvme_dump_config(ctx);
+		nvme_dump_config(ctx, NULL);
 
 	return ret;
 }
@@ -714,7 +714,7 @@ int fabrics_connect(const char *desc, int argc, char **argv)
 	}
 
 	if (dump_config)
-		nvme_dump_config(ctx);
+		nvme_dump_config(ctx, NULL);
 
 	return 0;
 }
@@ -1029,10 +1029,10 @@ int fabrics_config(const char *desc, int argc, char **argv)
 	}
 
 	if (update_config)
-		nvme_update_config(ctx);
+		nvme_dump_config(ctx, config_file);
 
 	if (dump_config)
-		nvme_dump_config(ctx);
+		nvme_dump_config(ctx, NULL);
 
 	return 0;
 }

libnvme/libnvme/nvme.i

@@ -528,11 +528,8 @@ struct nvme_ns {
 	void refresh_topology() {
 		nvme_refresh_topology($self);
 	}
-	void update_config() {
-		nvme_update_config($self);
-	}
 	void dump_config() {
-		nvme_dump_config($self);
+		nvme_dump_config($self, NULL);
 	}
 }
 

libnvme/src/libnvme.ld

@@ -275,7 +275,6 @@ LIBNVME_2_0 {
 		nvme_transport_handle_set_submit_entry;
 		nvme_transport_handle_set_submit_exit;
 		nvme_unlink_ctrl;
-		nvme_update_config;
 		nvme_update_key;
 		nvme_uuid_find;
 		nvme_uuid_from_string;

libnvme/src/nvme/private.h

@@ -267,7 +267,6 @@ struct nvme_global_ctx {
 	struct list_head endpoints; /* MI endpoints */
 	struct list_head hosts;
 	struct nvme_log log;
-	bool modified;
 	bool mi_probe_enabled;
 	bool create_only;
 	bool dry_run;

libnvme/src/nvme/tree.c

@@ -404,17 +404,9 @@ int nvme_scan(const char *config_file, struct nvme_global_ctx **ctxp)
 	return ret;
 }
 
-int nvme_update_config(struct nvme_global_ctx *ctx)
+int nvme_dump_config(struct nvme_global_ctx *ctx, const char *config_file)
 {
-	if (!ctx->modified || !ctx->config_file)
-		return 0;
-
-	return json_update_config(ctx, ctx->config_file);
-}
-
-int nvme_dump_config(struct nvme_global_ctx *ctx)
-{
-	return json_update_config(ctx, NULL);
+	return json_update_config(ctx, config_file);
 }
 
 int nvme_dump_tree(struct nvme_global_ctx *ctx)
@@ -717,7 +709,6 @@ struct nvme_subsystem *nvme_alloc_subsystem(struct nvme_host *h,
 	list_head_init(&s->namespaces);
 	list_node_init(&s->entry);
 	list_add_tail(&h->subsystems, &s->entry);
-	h->ctx->modified = true;
 	return s;
 }
 
@@ -756,7 +747,6 @@ static void __nvme_free_host(struct nvme_host *h)
 	free(h->hostid);
 	free(h->dhchap_key);
 	nvme_host_set_hostsymname(h, NULL);
-	h->ctx->modified = true;
 	free(h);
 }
 
@@ -799,7 +789,6 @@ struct nvme_host *nvme_lookup_host(struct nvme_global_ctx *ctx, const char *host
 	list_node_init(&h->entry);
 	h->ctx = ctx;
 	list_add_tail(&ctx->hosts, &h->entry);
-	ctx->modified = true;
 
 	return h;
 }
@@ -1870,7 +1859,6 @@ nvme_ctrl_t nvme_lookup_ctrl(nvme_subsystem_t s, const char *transport,
 
 	c->s = s;
 	list_add_tail(&s->ctrls, &c->entry);
-	s->h->ctx->modified = true;
 
 	return c;
 }

libnvme/src/nvme/tree.h

@@ -1453,26 +1453,18 @@ int nvme_read_config(struct nvme_global_ctx *ctx, const char *config_file);
  */
 void nvme_refresh_topology(struct nvme_global_ctx *ctx);
 
-/**
- * nvme_update_config() - Update JSON configuration
- * @ctx:		&struct nvme_global_ctx object
- *
- * Updates the JSON configuration file with the contents of @r.
- *
- * Return: 0 on success, -1 on failure.
- */
-int nvme_update_config(struct nvme_global_ctx *ctx);
-
 /**
  * nvme_dump_config() - Print the JSON configuration
  * @ctx:		&struct nvme_global_ctx object
+ * @config_file:	JSON configuration file.
  *
  * Prints the current contents of the JSON configuration
- * file to stdout.
+ * file to the config_file. If connfig_file is not provided it prints
+ * to stdout.
  *
  * Return: 0 on success, or negative error code otherwise.
  */
-int nvme_dump_config(struct nvme_global_ctx *ctx);
+int nvme_dump_config(struct nvme_global_ctx *ctx, const char *config_file);
 
 /**
  * nvme_dump_tree() - Dump internal object tree

libnvme/test/config/config-dump.c

@@ -29,7 +29,7 @@ static bool config_dump(const char *file)
 	if (err)
 		goto out;
 
-	err = nvme_dump_config(ctx);
+	err = nvme_dump_config(ctx, NULL);
 	if (err)
 		goto out;
 

libnvme/test/config/psk-json.c

@@ -69,7 +69,7 @@ static bool psk_json_test(char *file)
 				if (!import_export_key(c))
 					goto out;
 
-	err = nvme_dump_config(ctx);
+	err = nvme_dump_config(ctx, NULL);
 	if (err)
 		goto out;