nvme-cli: change nqntype to subtype, per spec

Fabrics spec has no field called 'nqntype', rather
it's 'subtype'.

Signed-off-by: Jay Freyensee <james_p_freyensee@linux.intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

diff --git a/fabrics.c b/fabrics.c
index e7e3c565dba5e6d00bde00f18ea0021b448401d8..04b4ff96daca447d2e3df365d2b828e0b3b1c2f0 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -105,14 +105,14 @@ static inline const char *adrfam_str(__u8 adrfam)
        return arg_str(adrfams, ARRAY_SIZE(adrfams), adrfam);
 }
 
-static const char * const nqntypes[] = {
+static const char * const subtypes[] = {
        [NVME_NQN_DISC]         = "discovery subsystem",
        [NVME_NQN_NVME]         = "nvme subsystem",
 };
 
-static inline const char *nqntype_str(__u8 nqntype)
+static inline const char *subtype_str(__u8 subtype)
 {
-       return arg_str(nqntypes, ARRAY_SIZE(nqntypes), nqntype);
+       return arg_str(subtypes, ARRAY_SIZE(subtypes), subtype);
 }
 
 static const char * const treqs[] = {
@@ -367,7 +367,7 @@ static void print_discovery_log(struct nvmf_disc_rsp_page_hdr *log, int numrec)
                printf("=====Discovery Log Entry %d======\n", i);
                printf("trtype:  %s\n", trtype_str(e->trtype));
                printf("adrfam:  %s\n", adrfam_str(e->adrfam));
-               printf("nqntype: %s\n", nqntype_str(e->nqntype));
+               printf("subtype: %s\n", subtype_str(e->subtype));
                printf("treq:    %s\n", treq_str(e->treq));
                printf("portid:  %d\n", e->portid);
                printf("trsvcid: %s\n", e->trsvcid);
@@ -499,14 +499,14 @@ static int connect_ctrl(struct nvmf_disc_rsp_page_entry *e)
        bool discover = false;
        int len;
 
-       switch (e->nqntype) {
+       switch (e->subtype) {
        case NVME_NQN_DISC:
                discover = true;
        case NVME_NQN_NVME:
                break;
        default:
-               fprintf(stderr, "skipping unsupported NQNtype %d\n",
-                        e->nqntype);
+               fprintf(stderr, "skipping unsupported subtype %d\n",
+                        e->subtype);
                return -EINVAL;
        }
 

diff --git a/nvme.h b/nvme.h
index e602818552a6d6e1844d9357fe2b4610699a97b7..e9e4433406dff1e0f6cdec4ac7fbde8cb4834795 100644 (file)
--- a/nvme.h
+++ b/nvme.h
@@ -566,7 +566,7 @@ struct nvme_bar_cap {
 struct nvmf_disc_rsp_page_entry {
        __u8    trtype;
        __u8    adrfam;
-       __u8    nqntype;
+       __u8    subtype;
        __u8    treq;
        __le16  portid;
        __le16  cntlid;