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

lib/iscsi: change type of spdk_iscsi_send_nopin to void

Browse Source 
Change-Id: Ie7a940efde885dbf0bb7c085fd17c3991dfa3341
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/403165
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ziye Yang 2018-03-09 01:16:21 +08:00 committed by Jim Harris
parent b4e68642e8
commit 0c1003e983
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/iscsi/iscsi.c
View File

@ -4271,7 +4271,7 @@ spdk_iscsi_send_r2t(struct spdk_iscsi_conn *conn,
return SPDK_SUCCESS; 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 spdk_iscsi_pdu *rsp_pdu;
struct iscsi_bhs_nop_in *rsp; struct iscsi_bhs_nop_in *rsp;
@ -4280,7 +4280,7 @@ int spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn)
if (conn->sess == NULL || if (conn->sess == NULL ||
!conn->full_feature || !conn->full_feature ||
!spdk_iscsi_param_eq_val(conn->sess->params, "SessionType", "Normal")) { !spdk_iscsi_param_eq_val(conn->sess->params, "SessionType", "Normal")) {
return SPDK_SUCCESS; return;
} }
SPDK_DEBUGLOG(SPDK_LOG_ISCSI, 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); spdk_iscsi_conn_write_pdu(conn, rsp_pdu);
conn->nop_outstanding = true; conn->nop_outstanding = true;
return SPDK_SUCCESS;
} }
static void static void

2
lib/iscsi/iscsi.h
View File

@ -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_shutdown_iscsi_conns_done(void);
void spdk_iscsi_config_text(FILE *fp); 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, void spdk_iscsi_task_response(struct spdk_iscsi_conn *conn,
struct spdk_iscsi_task *task); struct spdk_iscsi_task *task);
int spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu); int spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu);

3
test/unit/lib/iscsi/conn.c/conn_ut.c
View File

@ -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 int