From d48776401c6829de0273831ab7184b06990dad36 Mon Sep 17 00:00:00 2001 From: Anil Veerabhadrappa Date: Mon, 23 Dec 2019 11:51:50 -0800 Subject: [PATCH] nvmf/fc: fix FC compilation error Recent effort to unify NVMe NQN length macro replaced 'FCNVME_ASSOC_HOSTNQN_LEN' with 'SPDK_NVME_NQN_FIELD_SIZE' in include/spdk/nvmf_fc_spec.h. This change updates the downstream files which are also affected by the change. Signed-off-by: Anil Veerabhadrappa Change-Id: I44e1de50067e11fabacbb69cf1c42331f3339bc8 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478769 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Alexey Marchuk Reviewed-by: Jim Harris Reviewed-by: Ben Walker Community-CI: SPDK CI Jenkins --- lib/nvmf/fc_ls.c | 4 ++-- lib/nvmf/nvmf_fc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/nvmf/fc_ls.c b/lib/nvmf/fc_ls.c index 08011eb5d..efa151a07 100644 --- a/lib/nvmf/fc_ls.c +++ b/lib/nvmf/fc_ls.c @@ -287,8 +287,8 @@ nvmf_fc_ls_new_association(uint32_t s_id, assoc->subsystem = subsys; assoc->assoc_state = SPDK_NVMF_FC_OBJECT_CREATED; memcpy(assoc->host_id, a_cmd->hostid, FCNVME_ASSOC_HOSTID_LEN); - memcpy(assoc->host_nqn, a_cmd->hostnqn, FCNVME_ASSOC_HOSTNQN_LEN); - memcpy(assoc->sub_nqn, a_cmd->subnqn, FCNVME_ASSOC_HOSTNQN_LEN); + memcpy(assoc->host_nqn, a_cmd->hostnqn, SPDK_NVME_NQN_FIELD_SIZE); + memcpy(assoc->sub_nqn, a_cmd->subnqn, SPDK_NVME_NQN_FIELD_SIZE); TAILQ_INIT(&assoc->fc_conns); TAILQ_INIT(&assoc->avail_fc_conns); assoc->ls_del_op_ctx = NULL; diff --git a/lib/nvmf/nvmf_fc.h b/lib/nvmf/nvmf_fc.h index f2408d525..dcd3f928c 100644 --- a/lib/nvmf/nvmf_fc.h +++ b/lib/nvmf/nvmf_fc.h @@ -367,8 +367,8 @@ struct spdk_nvmf_fc_association { enum spdk_nvmf_fc_object_state assoc_state; char host_id[FCNVME_ASSOC_HOSTID_LEN]; - char host_nqn[FCNVME_ASSOC_HOSTNQN_LEN]; - char sub_nqn[FCNVME_ASSOC_HOSTNQN_LEN]; + char host_nqn[SPDK_NVME_NQN_FIELD_SIZE]; + char sub_nqn[SPDK_NVME_NQN_FIELD_SIZE]; struct spdk_nvmf_fc_conn *aq_conn; /* connection for admin queue */