From: Martin George <marting@netapp.com>
Date: Fri, 28 Oct 2022 16:50:59 +0000 (+0530)
Subject: fabrics: fix 'persistent' handling during connect-all with JSON file
X-Git-Tag: v2.2~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b702b9a1186d8a94b11580051cf3ab78ce2ea5eb;p=users%2Fsagi%2Fnvme-cli.git

fabrics: fix 'persistent' handling during connect-all with JSON file

Enable 'persistent' flag during nvme connect-all if set in the
config JSON file.

Signed-off-by: Martin George <marting@netapp.com>
[dwagner: added fallback implementation]
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/fabrics.c b/fabrics.c
index 0a5af33f..5560b723 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -642,6 +642,9 @@ static int discover_from_json_config_file(nvme_root_t r, nvme_host_t h,
 			else
 				subsysnqn = NVME_DISC_SUBSYS_NAME;
 
+			if (nvme_ctrl_is_persistent(c))
+				persistent = true;
+
 			memcpy(&cfg, defcfg, sizeof(cfg));
 
 			struct tr_config trcfg = {
diff --git a/libnvme-wrap.c b/libnvme-wrap.c
index bbd86009..354e7f7a 100644
--- a/libnvme-wrap.c
+++ b/libnvme-wrap.c
@@ -48,3 +48,9 @@ FN(nvme_get_feature_length2,
 	      __u32 *len),
 	ARGS(fid, cdw11, dir, len),
 	-EEXIST)
+
+FN(nvme_ctrl_is_persistent,
+	bool,
+	PROTO(nvme_ctrl_t c),
+	ARGS(c),
+	false)