Commit 62e0342e authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvme: minor alignment in ctrlr construct for pcie and rdma 



Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I35db32e867f91269608c72dbb9290a7ed2e3f31d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1234


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 67befd47

lib/nvme/nvme_pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_ 
	pctrlr->ctrlr.is_removed = false;

	pctrlr->devhandle = devhandle;

	pctrlr->ctrlr.opts = *opts;

	memcpy(&pctrlr->ctrlr.trid, trid, sizeof(pctrlr->ctrlr.trid));

	pctrlr->ctrlr.trid = *trid;



	rc = nvme_ctrlr_construct(&pctrlr->ctrlr);

	if (rc != 0) {

lib/nvme/nvme_rdma.c

+5 −3
Original line number Diff line number Diff line
@@ -1745,14 +1745,16 @@ static struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_ 
		return NULL;

	}



	memcpy(&rctrlr->ctrlr.trid, trid, sizeof(rctrlr->ctrlr.trid));

	rctrlr->ctrlr.opts = *opts;

	if (rctrlr->ctrlr.opts.transport_retry_count > NVME_RDMA_CTRLR_MAX_TRANSPORT_RETRY_COUNT) {

	rctrlr->ctrlr.trid = *trid;



	if (opts->transport_retry_count > NVME_RDMA_CTRLR_MAX_TRANSPORT_RETRY_COUNT) {

		SPDK_NOTICELOG("transport_retry_count exceeds max value %d, use max value\n",

			       NVME_RDMA_CTRLR_MAX_TRANSPORT_RETRY_COUNT);

		rctrlr->ctrlr.opts.transport_retry_count = NVME_RDMA_CTRLR_MAX_TRANSPORT_RETRY_COUNT;

	}

	if (rctrlr->ctrlr.opts.transport_ack_timeout > NVME_RDMA_CTRLR_MAX_TRANSPORT_ACK_TIMEOUT) {



	if (opts->transport_ack_timeout > NVME_RDMA_CTRLR_MAX_TRANSPORT_ACK_TIMEOUT) {

		SPDK_NOTICELOG("transport_ack_timeout exceeds max value %d, use max value\n",

			       NVME_RDMA_CTRLR_MAX_TRANSPORT_ACK_TIMEOUT);

		rctrlr->ctrlr.opts.transport_ack_timeout = NVME_RDMA_CTRLR_MAX_TRANSPORT_ACK_TIMEOUT;