Commit d4877640 authored by Anil Veerabhadrappa's avatar Anil Veerabhadrappa Committed by Tomasz Zawadzki
Browse files

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: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Change-Id: I44e1de50067e11fabacbb69cf1c42331f3339bc8
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478769


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
parent 58938d09

lib/nvmf/fc_ls.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

lib/nvmf/nvmf_fc.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */