nbft: make lookup_ctrl function public

To prepare for the addition of nbft functionality fixup the fabrics
declarations.

Signed-off-by: John Meneghini <jmeneghi@redhat.com>

diff --git a/fabrics.c b/fabrics.c
index f8078e597087bd2f53469739a0a6c62c9904fb77..80827b163a63b3176f76445ec7a43dd6515a8184 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -43,6 +43,7 @@
 #include "libnvme.h"
 #include "nvme-print.h"
 #include "nvme-print-json.h"
+#include "fabrics.h"
 
 #define PATH_NVMF_DISC         SYSCONFDIR "/nvme/discovery.conf"
 #define PATH_NVMF_CONFIG       SYSCONFDIR "/nvme/config.json"
@@ -110,15 +111,6 @@ static const char *nvmf_config_file        = "Use specified JSON configuration file or
        OPT_FLAG("data-digest",       'G', &c.data_digest,        nvmf_data_digest), \
        OPT_FLAG("tls",                 0, &c.tls,                nvmf_tls)     \
 
-struct tr_config {
-       const char *subsysnqn;
-       const char *transport;
-       const char *traddr;
-       const char *host_traddr;
-       const char *host_iface;
-       const char *trsvcid;
-};
-
 /*
  * Compare two C strings and handle NULL pointers gracefully.
  * If either of the two strings is NULL, return 0
@@ -202,7 +194,7 @@ static nvme_ctrl_t lookup_discovery_ctrl(nvme_root_t r, struct tr_config *trcfg)
        return __lookup_ctrl(r, trcfg, disc_ctrl_config_match);
 }
 
-static nvme_ctrl_t lookup_ctrl(nvme_root_t r, struct tr_config *trcfg)
+nvme_ctrl_t lookup_ctrl(nvme_root_t r, struct tr_config *trcfg)
 {
        return __lookup_ctrl(r, trcfg, ctrl_config_match);
 }

diff --git a/fabrics.h b/fabrics.h
index d1e16fc57c6d2841f5a697dba4b449969f34e551..02cebf5da1a1dd5b84f88447f291c3a395d16c87 100644 (file)
--- a/fabrics.h
+++ b/fabrics.h
@@ -2,6 +2,16 @@
 #ifndef _FABRICS_H
 #define _FABRICS_H
 
+struct tr_config {
+       const char *subsysnqn;
+       const char *transport;
+       const char *traddr;
+       const char *host_traddr;
+       const char *host_iface;
+       const char *trsvcid;
+};
+
+extern nvme_ctrl_t lookup_ctrl(nvme_root_t r, struct tr_config *trcfg);
 extern int nvmf_discover(const char *desc, int argc, char **argv, bool connect);
 extern int nvmf_connect(const char *desc, int argc, char **argv);
 extern int nvmf_disconnect(const char *desc, int argc, char **argv);