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

lib/iscsi: Embed _iscsi_conn_free() into the caller and free it

Browse Source 
_iscsi_conn_free() is simple enough to embed it into the caller
and remove it.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I22bcbbdab15eca647914715754c04b8ec14ad9b2
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472901
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-10-31 14:27:22 +09:00 committed by Tomasz Zawadzki
parent 9a25fc12bb
commit 71f63bb7d9
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/iscsi/conn.c
View File

@ -368,18 +368,6 @@ iscsi_conn_free_tasks(struct spdk_iscsi_conn *conn)
return 0; return 0;
} }
static void
_iscsi_conn_free(struct spdk_iscsi_conn *conn)
{
if (conn == NULL) {
return;
}
spdk_iscsi_param_free(conn->params);
free_conn(conn);
}
static void static void
iscsi_conn_cleanup_backend(struct spdk_iscsi_conn *conn) iscsi_conn_cleanup_backend(struct spdk_iscsi_conn *conn)
{ {
@ -446,7 +434,8 @@ iscsi_conn_free(struct spdk_iscsi_conn *conn)
end: end:
SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "cleanup free conn\n"); SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "cleanup free conn\n");
_iscsi_conn_free(conn); spdk_iscsi_param_free(conn->params);
free_conn(conn);
pthread_mutex_unlock(&g_conns_mutex); pthread_mutex_unlock(&g_conns_mutex);
} }