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 0a5af33ffa7faf6459b268b4387384985065faa7..5560b723d0db3e5b7436c5ffc1d20d43acc159e7 100644 (file)
--- 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 bbd860093c912df733065335493d30606711b221..354e7f7afa3a43fac723c7a25bb6128036697d7c 100644 (file)
--- 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)