From 9c5c2cf7c84a8a1b2c13ffff55b8c0c66a90c592 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Fri, 9 Mar 2018 15:46:42 +0800 Subject: [PATCH] lib/iscsi: Move last_nopin update in spdk_iscsi_send_nopin If we are not in ffp phase, we do not need to update last_nopin Change-Id: I289beec8437d7117b6261483c333bf5db5fbd11f Signed-off-by: Ziye Yang Reviewed-on: https://review.gerrithub.io/403166 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp --- lib/iscsi/conn.c | 1 - lib/iscsi/iscsi.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c index a90eced82..a72010b7a 100644 --- a/lib/iscsi/conn.c +++ b/lib/iscsi/conn.c @@ -913,7 +913,6 @@ spdk_iscsi_conn_handle_nop(struct spdk_iscsi_conn *conn) conn->state = ISCSI_CONN_STATE_EXITING; } } else if (tsc - conn->last_nopin > conn->nopininterval) { - conn->last_nopin = tsc; spdk_iscsi_send_nopin(conn); } } diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index ae0dc3a53..999667e4a 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -4312,6 +4312,7 @@ void spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn) to_be32(&rsp->max_cmd_sn, conn->sess->MaxCmdSN); spdk_iscsi_conn_write_pdu(conn, rsp_pdu); + conn->last_nopin = spdk_get_ticks(); conn->nop_outstanding = true; }