Commit 038b319d authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

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



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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449716


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c1d59e0d

lib/iscsi/conn.c

+10 −10
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ iscsi_conn_check_shutdown(void *arg) 
}



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;
@@ -649,12 +649,12 @@ spdk_iscsi_conn_close_lun(struct spdk_iscsi_conn *conn, int lun_id) 
}



static void

spdk_iscsi_conn_close_luns(struct spdk_iscsi_conn *conn)

iscsi_conn_close_luns(struct spdk_iscsi_conn *conn)

{

	int 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

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_event *event;
@@ -710,7 +710,7 @@ spdk_iscsi_conn_remove_lun(struct spdk_scsi_lun *lun, void *remove_ctx) 
}



static void

spdk_iscsi_conn_open_luns(struct spdk_iscsi_conn *conn)

iscsi_conn_open_luns(struct spdk_iscsi_conn *conn)

{

	int i, rc;

	struct spdk_scsi_lun *lun;
@@ -722,7 +722,7 @@ spdk_iscsi_conn_open_luns(struct spdk_iscsi_conn *conn) 
			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) {

			goto error;

		}
@@ -739,7 +739,7 @@ spdk_iscsi_conn_open_luns(struct spdk_iscsi_conn *conn) 
	return;



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--;

		pthread_mutex_unlock(&target->mutex);



		spdk_iscsi_conn_close_luns(conn);

		iscsi_conn_close_luns(conn);

	}



	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;



	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. */