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

iscsi: Remove the prefix spdk_ from private functions missed in the previous patch

Browse Source 
A few private functions had still the prefix spdk_ in their names.
This patch completes the effort to remove the prefix spdk_ from
private functions in iSCSI library.

Change-Id: Ic1a1e85220edb72296ca4881bdf7b550c4f6b6b8
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449716
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-04-01 10:58:21 +09:00 committed by Jim Harris
parent c1d59e0d0c
commit 038b319dfb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/iscsi/conn.c
View File

@ -636,7 +636,7 @@ iscsi_conn_check_shutdown(void *arg)
} }
static void static void
spdk_iscsi_conn_close_lun(struct spdk_iscsi_conn *conn, int lun_id) iscsi_conn_close_lun(struct spdk_iscsi_conn *conn, int lun_id)
{ {
struct spdk_scsi_desc *desc; struct spdk_scsi_desc *desc;
@ -649,12 +649,12 @@ spdk_iscsi_conn_close_lun(struct spdk_iscsi_conn *conn, int lun_id)
} }
static void static void
spdk_iscsi_conn_close_luns(struct spdk_iscsi_conn *conn) iscsi_conn_close_luns(struct spdk_iscsi_conn *conn)
{ {
int i; int i;
for (i = 0; i < SPDK_SCSI_DEV_MAX_LUN; i++) { for (i = 0; i < SPDK_SCSI_DEV_MAX_LUN; i++) {
spdk_iscsi_conn_close_lun(conn, i); iscsi_conn_close_lun(conn, i);
} }
} }
@ -695,11 +695,11 @@ _iscsi_conn_remove_lun(void *arg1, void *arg2)
} }
} }
spdk_iscsi_conn_close_lun(conn, lun_id); iscsi_conn_close_lun(conn, lun_id);
} }
static void static void
spdk_iscsi_conn_remove_lun(struct spdk_scsi_lun *lun, void *remove_ctx) iscsi_conn_remove_lun(struct spdk_scsi_lun *lun, void *remove_ctx)
{ {
struct spdk_iscsi_conn *conn = remove_ctx; struct spdk_iscsi_conn *conn = remove_ctx;
struct spdk_event *event; struct spdk_event *event;
@ -710,7 +710,7 @@ spdk_iscsi_conn_remove_lun(struct spdk_scsi_lun *lun, void *remove_ctx)
} }
static void static void
spdk_iscsi_conn_open_luns(struct spdk_iscsi_conn *conn) iscsi_conn_open_luns(struct spdk_iscsi_conn *conn)
{ {
int i, rc; int i, rc;
struct spdk_scsi_lun *lun; struct spdk_scsi_lun *lun;
@ -722,7 +722,7 @@ spdk_iscsi_conn_open_luns(struct spdk_iscsi_conn *conn)
continue; continue;
} }
rc = spdk_scsi_lun_open(lun, spdk_iscsi_conn_remove_lun, conn, &desc); rc = spdk_scsi_lun_open(lun, iscsi_conn_remove_lun, conn, &desc);
if (rc != 0) { if (rc != 0) {
goto error; goto error;
} }
@ -739,7 +739,7 @@ spdk_iscsi_conn_open_luns(struct spdk_iscsi_conn *conn)
return; return;
error: error:
spdk_iscsi_conn_close_luns(conn); iscsi_conn_close_luns(conn);
} }
/** /**
@ -758,7 +758,7 @@ iscsi_conn_stop(struct spdk_iscsi_conn *conn)
target->num_active_conns--; target->num_active_conns--;
pthread_mutex_unlock(&target->mutex); pthread_mutex_unlock(&target->mutex);
spdk_iscsi_conn_close_luns(conn); iscsi_conn_close_luns(conn);
} }
assert(conn->lcore == spdk_env_get_current_core()); assert(conn->lcore == spdk_env_get_current_core());
@ -1448,7 +1448,7 @@ iscsi_conn_full_feature_migrate(void *arg1, void *arg2)
struct spdk_iscsi_conn *conn = arg1; struct spdk_iscsi_conn *conn = arg1;
if (conn->sess->session_type == SESSION_TYPE_NORMAL) { if (conn->sess->session_type == SESSION_TYPE_NORMAL) {
spdk_iscsi_conn_open_luns(conn); iscsi_conn_open_luns(conn);
} }
/* The poller has been unregistered, so now we can re-register it on the new core. */ /* The poller has been unregistered, so now we can re-register it on the new core. */