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

nvme/tcp: change the name of max_r2t to maxr2t

Browse Source 
Purpose: Make the variable definition consistent
with the same variable in the target side.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Change-Id: Ibc4ff92b6346f0a1ad803dcb79d041289f5648b2
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455807
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Ziye Yang 2019-05-28 01:18:51 +08:00 committed by Jim Harris
parent 8a43cd27e6
commit 804ca3e995
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nvme/nvme_tcp.c
View File

@ -86,7 +86,7 @@ struct nvme_tcp_qpair {
/** Specifies the maximum number of PDU-Data bytes per H2C Data Transfer PDU */ /** Specifies the maximum number of PDU-Data bytes per H2C Data Transfer PDU */
uint32_t maxh2cdata; uint32_t maxh2cdata;
int32_t max_r2t; int32_t maxr2t;
int32_t pending_r2t; int32_t pending_r2t;
/* 0 based value, which is used to guide the padding */ /* 0 based value, which is used to guide the padding */
@ -1327,9 +1327,9 @@ nvme_tcp_r2t_hdr_handle(struct nvme_tcp_qpair *tqpair, struct nvme_tcp_pdu *pdu)
tqpair); tqpair);
if (tcp_req->state != NVME_TCP_REQ_ACTIVE_R2T) { if (tcp_req->state != NVME_TCP_REQ_ACTIVE_R2T) {
if (tqpair->pending_r2t >= tqpair->max_r2t) { if (tqpair->pending_r2t >= tqpair->maxr2t) {
fes = SPDK_NVME_TCP_TERM_REQ_FES_PDU_SEQUENCE_ERROR; fes = SPDK_NVME_TCP_TERM_REQ_FES_PDU_SEQUENCE_ERROR;
SPDK_ERRLOG("Invalid R2T: it exceeds the R2T maixmal=%u for tqpair=%p\n", tqpair->max_r2t, tqpair); SPDK_ERRLOG("Invalid R2T: it exceeds the R2T maixmal=%u for tqpair=%p\n", tqpair->maxr2t, tqpair);
goto end; goto end;
} }
tcp_req->state = NVME_TCP_REQ_ACTIVE_R2T; tcp_req->state = NVME_TCP_REQ_ACTIVE_R2T;
@ -1712,7 +1712,7 @@ nvme_tcp_qpair_connect(struct nvme_tcp_qpair *tqpair)
return -1; return -1;
} }
tqpair->max_r2t = NVME_TCP_MAX_R2T_DEFAULT; tqpair->maxr2t = NVME_TCP_MAX_R2T_DEFAULT;
rc = nvme_tcp_qpair_icreq_send(tqpair); rc = nvme_tcp_qpair_icreq_send(tqpair);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Unable to connect the tqpair\n"); SPDK_ERRLOG("Unable to connect the tqpair\n");