tree: rename controller 'dhchap_key' to 'dhchap_ctrl_key'

To differentiate between 'host' and 'controller' keys within
the controller structure.

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

diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
index b68b7b94965ccaa8a1229a981cbbaeb9a2172b68..a2729bd212074615bb2af2403e6f0bae4dc4aa6f 100644 (file)
--- a/src/nvme/fabrics.c
+++ b/src/nvme/fabrics.c
@@ -619,8 +619,8 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
                         * in @cfg, so ensure to update @c with the correct
                         * controller key.
                         */
-                       if (fc->dhchap_key)
-                               nvme_ctrl_set_dhchap_key(c, fc->dhchap_key);
+                       if (fc->dhchap_ctrl_key)
+                               nvme_ctrl_set_dhchap_key(c, fc->dhchap_ctrl_key);
                }
 
        }

diff --git a/src/nvme/private.h b/src/nvme/private.h
index b5610f5ca45493104dedae86848d977b149b3b76..8a21afc0e0695c80285f810aab6523dd9c0697fe 100644 (file)
--- a/src/nvme/private.h
+++ b/src/nvme/private.h
@@ -82,7 +82,7 @@ struct nvme_ctrl {
        char *subsysnqn;
        char *traddr;
        char *trsvcid;
-       char *dhchap_key;
+       char *dhchap_ctrl_key;
        char *cntrltype;
        char *dctype;
        bool discovery_ctrl;

diff --git a/src/nvme/tree.c b/src/nvme/tree.c
index e3b41e793c97b2d0a3cee499e1d450cb5f9b00a6..989b7b3fae9427b67419a8891a678ba56c70f4fe 100644 (file)
--- a/src/nvme/tree.c
+++ b/src/nvme/tree.c
@@ -812,17 +812,17 @@ struct nvme_fabrics_config *nvme_ctrl_get_config(nvme_ctrl_t c)
 
 const char *nvme_ctrl_get_dhchap_key(nvme_ctrl_t c)
 {
-       return c->dhchap_key;
+       return c->dhchap_ctrl_key;
 }
 
 void nvme_ctrl_set_dhchap_key(nvme_ctrl_t c, const char *key)
 {
-       if (c->dhchap_key) {
-               free(c->dhchap_key);
-               c->dhchap_key = NULL;
+       if (c->dhchap_ctrl_key) {
+               free(c->dhchap_ctrl_key);
+               c->dhchap_ctrl_key = NULL;
        }
        if (key)
-               c->dhchap_key = strdup(key);
+               c->dhchap_ctrl_key = strdup(key);
 }
 
 void nvme_ctrl_set_discovered(nvme_ctrl_t c, bool discovered)
@@ -897,7 +897,7 @@ void nvme_deconfigure_ctrl(nvme_ctrl_t c)
        FREE_CTRL_ATTR(c->queue_count);
        FREE_CTRL_ATTR(c->serial);
        FREE_CTRL_ATTR(c->sqsize);
-       FREE_CTRL_ATTR(c->dhchap_key);
+       FREE_CTRL_ATTR(c->dhchap_ctrl_key);
        FREE_CTRL_ATTR(c->address);
        FREE_CTRL_ATTR(c->dctype);
        FREE_CTRL_ATTR(c->cntrltype);
@@ -1166,10 +1166,10 @@ static int nvme_configure_ctrl(nvme_root_t r, nvme_ctrl_t c, const char *path,
        c->queue_count = nvme_get_ctrl_attr(c, "queue_count");
        c->serial = nvme_get_ctrl_attr(c, "serial");
        c->sqsize = nvme_get_ctrl_attr(c, "sqsize");
-       c->dhchap_key = nvme_get_ctrl_attr(c, "dhchap_ctrl_secret");
-       if (c->dhchap_key && !strcmp(c->dhchap_key, "none")) {
-               free(c->dhchap_key);
-               c->dhchap_key = NULL;
+       c->dhchap_ctrl_key = nvme_get_ctrl_attr(c, "dhchap_ctrl_secret");
+       if (c->dhchap_ctrl_key && !strcmp(c->dhchap_ctrl_key, "none")) {
+               free(c->dhchap_ctrl_key);
+               c->dhchap_ctrl_key = NULL;
        }
        c->cntrltype = nvme_get_ctrl_attr(c, "cntrltype");
        c->dctype = nvme_get_ctrl_attr(c, "dctype");