From 804ca3e995f059e748406f75e1dbc25e6a3af214 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Tue, 28 May 2019 01:18:51 +0800 Subject: [PATCH] nvme/tcp: change the name of max_r2t to maxr2t Purpose: Make the variable definition consistent with the same variable in the target side. Signed-off-by: Ziye Yang Change-Id: Ibc4ff92b6346f0a1ad803dcb79d041289f5648b2 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455807 Reviewed-by: Ben Walker Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- lib/nvme/nvme_tcp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index fa878971a..2aa4386a5 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -86,7 +86,7 @@ struct nvme_tcp_qpair { /** Specifies the maximum number of PDU-Data bytes per H2C Data Transfer PDU */ uint32_t maxh2cdata; - int32_t max_r2t; + int32_t maxr2t; int32_t pending_r2t; /* 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); 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; - 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; } tcp_req->state = NVME_TCP_REQ_ACTIVE_R2T; @@ -1712,7 +1712,7 @@ nvme_tcp_qpair_connect(struct nvme_tcp_qpair *tqpair) return -1; } - tqpair->max_r2t = NVME_TCP_MAX_R2T_DEFAULT; + tqpair->maxr2t = NVME_TCP_MAX_R2T_DEFAULT; rc = nvme_tcp_qpair_icreq_send(tqpair); if (rc != 0) { SPDK_ERRLOG("Unable to connect the tqpair\n");