build: Update libnvme wrap

Get updated nvmf_add_ctrl() argument list (libnvme PR#195)
and fixup callers.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/fabrics.c b/fabrics.c
index 55cc247c0e19596273b2d3301c9fb25689d34bd3..bd2b6559d74b99ab7c596d7e34b977d4e19a027e 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -394,7 +394,7 @@ static int discover_from_conf_file(nvme_host_t h, const char *desc,
                        goto next;
                nvme_ctrl_set_discovery_ctrl(c, true);
                errno = 0;
-               ret = nvmf_add_ctrl(h, c, &cfg, false);
+               ret = nvmf_add_ctrl(h, c, &cfg);
                if (!ret) {
                        __discover(c, &cfg, raw, connect,
                                   persistent, flags);
@@ -546,7 +546,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
                        goto out_free;
                }
                nvme_ctrl_set_discovery_ctrl(c, true);
-               ret = nvmf_add_ctrl(h, c, &cfg, false);
+               ret = nvmf_add_ctrl(h, c, &cfg);
                if (ret) {
                        nvme_msg(LOG_ERR,
                                 "failed to add controller, error %d\n", errno);
@@ -676,7 +676,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
                nvme_ctrl_set_dhchap_key(c, ctrlkey);
 
        errno = 0;
-       ret = nvmf_add_ctrl(h, c, &cfg, cfg.disable_sqflow);
+       ret = nvmf_add_ctrl(h, c, &cfg);
        if (ret)
                nvme_msg(LOG_ERR, "no controller found\n");
        else {

diff --git a/subprojects/libnvme.wrap b/subprojects/libnvme.wrap
index bdedbe02146d3eecad5fb3f36993601be005559e..1e797bd42f78f08fd60c77084000375d14d71238 100644 (file)
--- a/subprojects/libnvme.wrap
+++ b/subprojects/libnvme.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/linux-nvme/libnvme.git
-revision = 63ea2203a4aa0d25590c585db35e274370f99717
+revision = fcf7edfe4daf298ef4a2790666a9ba7b579f34e1
 
 [provide]
 libnvme = libnvme_dep