ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf/fc: fix FC compilation error

Browse Source 
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 <anil.veerabhadrappa@broadcom.com>
Change-Id: I44e1de50067e11fabacbb69cf1c42331f3339bc8
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478769
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Alexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Anil Veerabhadrappa 2019-12-23 11:51:50 -08:00 committed by Tomasz Zawadzki
parent 58938d09bf
commit d48776401c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nvmf/fc_ls.c
View File

@ -287,8 +287,8 @@ nvmf_fc_ls_new_association(uint32_t s_id,
assoc->subsystem = subsys; assoc->subsystem = subsys;
assoc->assoc_state = SPDK_NVMF_FC_OBJECT_CREATED; assoc->assoc_state = SPDK_NVMF_FC_OBJECT_CREATED;
memcpy(assoc->host_id, a_cmd->hostid, FCNVME_ASSOC_HOSTID_LEN); memcpy(assoc->host_id, a_cmd->hostid, FCNVME_ASSOC_HOSTID_LEN);
memcpy(assoc->host_nqn, a_cmd->hostnqn, FCNVME_ASSOC_HOSTNQN_LEN); memcpy(assoc->host_nqn, a_cmd->hostnqn, SPDK_NVME_NQN_FIELD_SIZE);
memcpy(assoc->sub_nqn, a_cmd->subnqn, FCNVME_ASSOC_HOSTNQN_LEN); memcpy(assoc->sub_nqn, a_cmd->subnqn, SPDK_NVME_NQN_FIELD_SIZE);
TAILQ_INIT(&assoc->fc_conns); TAILQ_INIT(&assoc->fc_conns);
TAILQ_INIT(&assoc->avail_fc_conns); TAILQ_INIT(&assoc->avail_fc_conns);
assoc->ls_del_op_ctx = NULL; assoc->ls_del_op_ctx = NULL;

4
lib/nvmf/nvmf_fc.h
View File

@ -367,8 +367,8 @@ struct spdk_nvmf_fc_association {
enum spdk_nvmf_fc_object_state assoc_state; enum spdk_nvmf_fc_object_state assoc_state;
char host_id[FCNVME_ASSOC_HOSTID_LEN]; char host_id[FCNVME_ASSOC_HOSTID_LEN];
char host_nqn[FCNVME_ASSOC_HOSTNQN_LEN]; char host_nqn[SPDK_NVME_NQN_FIELD_SIZE];
char sub_nqn[FCNVME_ASSOC_HOSTNQN_LEN]; char sub_nqn[SPDK_NVME_NQN_FIELD_SIZE];
struct spdk_nvmf_fc_conn *aq_conn; /* connection for admin queue */ struct spdk_nvmf_fc_conn *aq_conn; /* connection for admin queue */