From 2484d0d1cd6aa658f231aca5c6ef1d9c7fe5d781 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 18 Sep 2018 15:47:08 -0700 Subject: [PATCH] bdev/nvme: write TransportID to config file It was writing TransportId (lower-case d) instead. While here, fix similar issue in etc/spdk/nvmf.conf.in. lib/conf uses strcasecmp(), meaning TransportID and TransportId are effectively the same, but it's better to reduce confusion and just use the same in all places. Signed-off-by: Jim Harris Change-Id: I2996ba46a5c2a239650e841d5b57424ff00f47e6 Reviewed-on: https://review.gerrithub.io/426001 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: GangCao Reviewed-by: Ben Walker --- etc/spdk/nvmf.conf.in | 4 ++-- lib/bdev/nvme/bdev_nvme.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/spdk/nvmf.conf.in b/etc/spdk/nvmf.conf.in index 38fda47532..c143f8dd86 100644 --- a/etc/spdk/nvmf.conf.in +++ b/etc/spdk/nvmf.conf.in @@ -88,8 +88,8 @@ # other sections in the configuration file. For NVMe devices, a namespace # is automatically appended to each name in the format nY, where # Y is the NSID (starts at 1). - TransportId "trtype:PCIe traddr:0000:00:00.0" Nvme0 - TransportId "trtype:PCIe traddr:0000:01:00.0" Nvme1 + TransportID "trtype:PCIe traddr:0000:00:00.0" Nvme0 + TransportID "trtype:PCIe traddr:0000:01:00.0" Nvme1 # The number of attempts per I/O when an I/O fails. Do not include # this key to get the default behavior. diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c index 3d3b520c3d..9b1bd0e40c 100644 --- a/lib/bdev/nvme/bdev_nvme.c +++ b/lib/bdev/nvme/bdev_nvme.c @@ -1669,7 +1669,7 @@ bdev_nvme_get_spdk_running_config(FILE *fp) } if (nvme_ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_PCIE) { - fprintf(fp, "TransportId \"trtype:%s traddr:%s\" %s\n", + fprintf(fp, "TransportID \"trtype:%s traddr:%s\" %s\n", trtype, nvme_ctrlr->trid.traddr, nvme_ctrlr->name); } else { @@ -1678,12 +1678,12 @@ bdev_nvme_get_spdk_running_config(FILE *fp) adrfam = spdk_nvme_transport_id_adrfam_str(nvme_ctrlr->trid.adrfam); if (adrfam) { - fprintf(fp, "TransportId \"trtype:%s adrfam:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n", + fprintf(fp, "TransportID \"trtype:%s adrfam:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n", trtype, adrfam, nvme_ctrlr->trid.traddr, nvme_ctrlr->trid.trsvcid, nvme_ctrlr->trid.subnqn, nvme_ctrlr->name); } else { - fprintf(fp, "TransportId \"trtype:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n", + fprintf(fp, "TransportID \"trtype:%s traddr:%s trsvcid:%s subnqn:%s\" %s\n", trtype, nvme_ctrlr->trid.traddr, nvme_ctrlr->trid.trsvcid, nvme_ctrlr->trid.subnqn, nvme_ctrlr->name);