Commit 0c1003e9 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

lib/iscsi: change type of spdk_iscsi_send_nopin to void 



Change-Id: Ie7a940efde885dbf0bb7c085fd17c3991dfa3341
Signed-off-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/403165


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent b4e68642

lib/iscsi/iscsi.c

+2 −4
Original line number Diff line number Diff line
@@ -4271,7 +4271,7 @@ spdk_iscsi_send_r2t(struct spdk_iscsi_conn *conn, 
	return SPDK_SUCCESS;

}



int spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn)

void spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn)

{

	struct spdk_iscsi_pdu *rsp_pdu;

	struct iscsi_bhs_nop_in	*rsp;
@@ -4280,7 +4280,7 @@ int spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn) 
	if (conn->sess == NULL ||

	    !conn->full_feature ||

	    !spdk_iscsi_param_eq_val(conn->sess->params, "SessionType", "Normal")) {

		return SPDK_SUCCESS;

		return;

	}



	SPDK_DEBUGLOG(SPDK_LOG_ISCSI,
@@ -4313,8 +4313,6 @@ int spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn) 


	spdk_iscsi_conn_write_pdu(conn, rsp_pdu);

	conn->nop_outstanding = true;



	return SPDK_SUCCESS;

}



static void

lib/iscsi/iscsi.h

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ void spdk_iscsi_fini(spdk_iscsi_fini_cb cb_fn, void *cb_arg); 
void spdk_shutdown_iscsi_conns_done(void);

void spdk_iscsi_config_text(FILE *fp);



int spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn);

void spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn);

void spdk_iscsi_task_response(struct spdk_iscsi_conn *conn,

			      struct spdk_iscsi_task *task);

int spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu);

test/unit/lib/iscsi/conn.c/conn_ut.c

+1 −2
Original line number Diff line number Diff line
@@ -218,9 +218,8 @@ spdk_iscsi_task_mgmt_response(struct spdk_iscsi_conn *conn, 
{

}



int spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn)

void spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn)

{

	return 0;

}



int