Update libnvme integration for disconnect rename

Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/fabrics.c b/fabrics.c
index 5925e75d26fe3dc605f05894fea8708a996ed15d..635f11359f219fdbd68f598f596ba2caab26802a 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -273,7 +273,7 @@ static int __discover(nvme_ctrl_t c, const struct nvme_fabrics_config *defcfg,
                                                   persistent,
                                                   true, flags);
                                if (!persistent) {
-                                       nvme_ctrl_disconnect(child);
+                                       nvme_disconnect_ctrl(child);
                                        nvme_free_ctrl(child);
                                }
                        } else if (errno == EALREADY && !quiet) {
@@ -355,7 +355,7 @@ static int discover_from_conf_file(nvme_host_t h, const char *desc,
                                   connect, 0);
                                return 0;
                        if (!persistent)
-                               ret = nvme_ctrl_disconnect(c);
+                               ret = nvme_disconnect_ctrl(c);
                        nvme_free_ctrl(c);
                }
 next:
@@ -467,7 +467,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
                        ret = __discover(c, &cfg, raw, connect,
                                         persistent, flags);
                        if (!device && !persistent)
-                               nvme_ctrl_disconnect(c);
+                               nvme_disconnect_ctrl(c);
                        nvme_free_ctrl(c);
                } else {
                        nvme_msg(LOG_ERR, "no controller found\n");
@@ -645,7 +645,7 @@ int nvmf_disconnect(const char *desc, int argc, char **argv)
                                        if (strcmp(nvme_subsystem_get_nqn(s), p))
                                                continue;
                                        nvme_subsystem_for_each_ctrl(s, c) {
-                                               if (!nvme_ctrl_disconnect(c))
+                                               if (!nvme_disconnect_ctrl(c))
                                                        i++;
                                        }
                                }
@@ -666,7 +666,7 @@ int nvmf_disconnect(const char *desc, int argc, char **argv)
                                nvme_free_tree(r);
                                return errno;
                        }
-                       ret = nvme_ctrl_disconnect(c);
+                       ret = nvme_disconnect_ctrl(c);
                        if (!ret)
                                printf("Disconnected %s\n",
                                        nvme_ctrl_get_name(c));
@@ -738,7 +738,7 @@ int nvmf_disconnect_all(const char *desc, int argc, char **argv)
                                else if (!strcmp(nvme_ctrl_get_transport(c),
                                                 "pcie"))
                                        continue;
-                               if (nvme_ctrl_disconnect(c))
+                               if (nvme_disconnect_ctrl(c))
                                        nvme_msg(LOG_ERR,
                                                 "failed to disconnect %s\n",
                                                 nvme_ctrl_get_name(c));

diff --git a/libnvme b/libnvme
index 8bd0e3843d7be56edf5a64be8413d09c73b565ff..d276cfdccd11867006afad592dc9ea595b79e26e 160000 (submodule)
--- a/libnvme
+++ b/libnvme
@@ -1 +1 @@
-Subproject commit 8bd0e3843d7be56edf5a64be8413d09c73b565ff
+Subproject commit d276cfdccd11867006afad592dc9ea595b79e26e