Commit 6a313725 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/iscsi: Remove the "spdk_" prefix from internal APIs declared in tgt_node.h 



Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I27419445fbd938b56b66a5ba2cc1cde75e7129ac
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1886


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
parent 040095db

lib/iscsi/conn.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ iscsi_conn_cleanup_backend(struct spdk_iscsi_conn *conn) 
		/* clean up all tasks to all LUNs for session */

		target = conn->sess->target;

		if (target != NULL) {

			rc = spdk_iscsi_tgt_node_cleanup_luns(conn, target);

			rc = iscsi_tgt_node_cleanup_luns(conn, target);

			if (rc < 0) {

				SPDK_ERRLOG("target abort failed\n");

			}

lib/iscsi/iscsi.c

+15 −15
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ iscsi_op_login_check_target(struct spdk_iscsi_conn *conn, 
	struct iscsi_bhs_login_rsp *rsph;



	rsph = (struct iscsi_bhs_login_rsp *)&rsp_pdu->bhs;

	*target = spdk_iscsi_find_tgt_node(target_name);

	*target = iscsi_find_tgt_node(target_name);

	if (*target == NULL) {

		SPDK_WARNLOG("target %s not found\n", target_name);

		/* Not found */
@@ -1462,13 +1462,13 @@ iscsi_op_login_check_target(struct spdk_iscsi_conn *conn, 
		rsph->status_detail = ISCSI_LOGIN_TARGET_NOT_FOUND;

		return SPDK_ISCSI_LOGIN_ERROR_RESPONSE;

	}

	if (spdk_iscsi_tgt_node_is_destructed(*target)) {

	if (iscsi_tgt_node_is_destructed(*target)) {

		SPDK_ERRLOG("target %s is removed\n", target_name);

		rsph->status_class = ISCSI_CLASS_INITIATOR_ERROR;

		rsph->status_detail = ISCSI_LOGIN_TARGET_REMOVED;

		return SPDK_ISCSI_LOGIN_ERROR_RESPONSE;

	}

	result = spdk_iscsi_tgt_node_access(conn, *target,

	result = iscsi_tgt_node_access(conn, *target,

				       conn->initiator_name,

				       conn->initiator_addr);

	if (!result) {
@@ -2398,7 +2398,7 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p 
				val = "ALL";

			}



			data_len = spdk_iscsi_send_tgts(conn,

			data_len = iscsi_send_tgts(conn,

						   conn->initiator_name,

						   conn->initiator_addr,

						   val, data, alloc_len,
@@ -2415,7 +2415,7 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p 
							     "Reject", data,

							     alloc_len, data_len);

			} else {

				data_len = spdk_iscsi_send_tgts(conn,

				data_len = iscsi_send_tgts(conn,

							   conn->initiator_name,

							   conn->initiator_addr,

							   val, data, alloc_len,

lib/iscsi/iscsi_rpc.c

+29 −29
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ spdk_rpc_iscsi_delete_initiator_group(struct spdk_jsonrpc_request *request, 
	if (!ig) {

		goto invalid;

	}

	spdk_iscsi_tgt_node_delete_map(NULL, ig);

	iscsi_tgt_node_delete_map(NULL, ig);

	spdk_iscsi_init_grp_destroy(ig);



	w = spdk_jsonrpc_begin_result(request);
@@ -314,7 +314,7 @@ spdk_rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request, 


	w = spdk_jsonrpc_begin_result(request);

	spdk_json_write_array_begin(w);

	spdk_iscsi_tgt_nodes_info_json(w);

	iscsi_tgt_nodes_info_json(w);

	spdk_json_write_array_end(w);



	spdk_jsonrpc_end_result(request, w);
@@ -476,7 +476,7 @@ spdk_rpc_iscsi_create_target_node(struct spdk_jsonrpc_request *request, 
	 *  index = -1 : automatically pick an index for the new target node

	 *  alias = NULL

	 */

	target = spdk_iscsi_tgt_node_construct(-1, req.name, req.alias_name,

	target = iscsi_tgt_node_construct(-1, req.name, req.alias_name,

					  pg_tags,

					  ig_tags,

					  req.pg_ig_maps.num_maps,
@@ -537,7 +537,7 @@ spdk_rpc_iscsi_target_node_add_pg_ig_maps(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	target = spdk_iscsi_find_tgt_node(req.name);

	target = iscsi_find_tgt_node(req.name);

	if (target == NULL) {

		SPDK_ERRLOG("target is not found\n");

		goto invalid;
@@ -548,7 +548,7 @@ spdk_rpc_iscsi_target_node_add_pg_ig_maps(struct spdk_jsonrpc_request *request, 
		ig_tags[i] = req.pg_ig_maps.maps[i].ig_tag;

	}



	rc = spdk_iscsi_target_node_add_pg_ig_maps(target, pg_tags, ig_tags,

	rc = iscsi_target_node_add_pg_ig_maps(target, pg_tags, ig_tags,

					      req.pg_ig_maps.num_maps);

	if (rc < 0) {

		SPDK_ERRLOG("add pg-ig maps failed\n");
@@ -589,7 +589,7 @@ spdk_rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *reques 
		goto invalid;

	}



	target = spdk_iscsi_find_tgt_node(req.name);

	target = iscsi_find_tgt_node(req.name);

	if (target == NULL) {

		SPDK_ERRLOG("target is not found\n");

		goto invalid;
@@ -600,7 +600,7 @@ spdk_rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *reques 
		ig_tags[i] = req.pg_ig_maps.maps[i].ig_tag;

	}



	rc = spdk_iscsi_target_node_remove_pg_ig_maps(target, pg_tags, ig_tags,

	rc = iscsi_target_node_remove_pg_ig_maps(target, pg_tags, ig_tags,

			req.pg_ig_maps.num_maps);

	if (rc < 0) {

		SPDK_ERRLOG("remove pg-ig maps failed\n");
@@ -685,7 +685,7 @@ spdk_rpc_iscsi_delete_target_node(struct spdk_jsonrpc_request *request, 


	ctx->request = request;



	spdk_iscsi_shutdown_tgt_node_by_name(ctx->req.name,

	iscsi_shutdown_tgt_node_by_name(ctx->req.name,

					rpc_iscsi_delete_target_node_done, ctx);

	return;
@@ -876,7 +876,7 @@ spdk_rpc_iscsi_delete_portal_group(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	spdk_iscsi_tgt_node_delete_map(pg, NULL);

	iscsi_tgt_node_delete_map(pg, NULL);

	spdk_iscsi_portal_grp_release(pg);



	w = spdk_jsonrpc_begin_result(request);
@@ -1053,13 +1053,13 @@ spdk_rpc_iscsi_target_node_add_lun(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	target = spdk_iscsi_find_tgt_node(req.name);

	target = iscsi_find_tgt_node(req.name);

	if (target == NULL) {

		SPDK_ERRLOG("target is not found\n");

		goto invalid;

	}



	rc = spdk_iscsi_tgt_node_add_lun(target, req.bdev_name, req.lun_id);

	rc = iscsi_tgt_node_add_lun(target, req.bdev_name, req.lun_id);

	if (rc < 0) {

		SPDK_ERRLOG("add lun failed\n");

		goto invalid;
@@ -1119,14 +1119,14 @@ spdk_rpc_iscsi_target_node_set_auth(struct spdk_jsonrpc_request *request, 
		goto exit;

	}



	target = spdk_iscsi_find_tgt_node(req.name);

	target = iscsi_find_tgt_node(req.name);

	if (target == NULL) {

		spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						     "Could not find target %s", req.name);

		goto exit;

	}



	rc = spdk_iscsi_tgt_node_set_chap_params(target, req.disable_chap, req.require_chap,

	rc = iscsi_tgt_node_set_chap_params(target, req.disable_chap, req.require_chap,

					    req.mutual_chap, req.chap_group);

	if (rc < 0) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

lib/iscsi/iscsi_subsystem.c

+9 −9
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ iscsi_opts_verify(struct spdk_iscsi_opts *opts) 
		return -EINVAL;

	}



	if (!spdk_iscsi_check_chap_params(opts->disable_chap, opts->require_chap,

	if (!iscsi_check_chap_params(opts->disable_chap, opts->require_chap,

				     opts->mutual_chap, opts->chap_group)) {

		SPDK_ERRLOG("CHAP params in opts are illegal combination\n");

		return -EINVAL;
@@ -777,7 +777,7 @@ int 
spdk_iscsi_set_discovery_auth(bool disable_chap, bool require_chap, bool mutual_chap,

			      int32_t chap_group)

{

	if (!spdk_iscsi_check_chap_params(disable_chap, require_chap, mutual_chap,

	if (!iscsi_check_chap_params(disable_chap, require_chap, mutual_chap,

				     chap_group)) {

		SPDK_ERRLOG("CHAP params are illegal combination\n");

		return -EINVAL;
@@ -1160,9 +1160,9 @@ iscsi_parse_configuration(void) 
		goto end;

	}



	rc = spdk_iscsi_parse_tgt_nodes();

	rc = iscsi_parse_tgt_nodes();

	if (rc < 0) {

		SPDK_ERRLOG("spdk_iscsi_parse_tgt_nodes() failed\n");

		SPDK_ERRLOG("iscsi_parse_tgt_nodes() failed\n");

	}



	if (g_iscsi.authfile != NULL) {
@@ -1407,7 +1407,7 @@ _iscsi_fini_dev_unreg(struct spdk_io_channel_iter *i, int status) 


	assert(TAILQ_EMPTY(&g_iscsi.poll_group_head));



	spdk_iscsi_shutdown_tgt_nodes();

	iscsi_shutdown_tgt_nodes();

	spdk_iscsi_init_grps_destroy();

	spdk_iscsi_portal_grps_destroy();

	iscsi_auth_groups_destroy();
@@ -1445,7 +1445,7 @@ spdk_iscsi_config_text(FILE *fp) 
	iscsi_globals_config_text(fp);

	spdk_iscsi_portal_grps_config_text(fp);

	spdk_iscsi_init_grps_config_text(fp);

	spdk_iscsi_tgt_nodes_config_text(fp);

	iscsi_tgt_nodes_config_text(fp);

}



void
@@ -1569,7 +1569,7 @@ spdk_iscsi_config_json(struct spdk_json_write_ctx *w) 
	iscsi_opts_config_json(w);

	spdk_iscsi_portal_grps_config_json(w);

	spdk_iscsi_init_grps_config_json(w);

	spdk_iscsi_tgt_nodes_config_json(w);

	iscsi_tgt_nodes_config_json(w);

	iscsi_auth_groups_config_json(w);

	spdk_json_write_array_end(w);

}

lib/iscsi/portal_grp.c

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ spdk_iscsi_portal_grp_set_chap_params(struct spdk_iscsi_portal_grp *pg, 
				      bool disable_chap, bool require_chap,

				      bool mutual_chap, int32_t chap_group)

{

	if (!spdk_iscsi_check_chap_params(disable_chap, require_chap,

	if (!iscsi_check_chap_params(disable_chap, require_chap,

				     mutual_chap, chap_group)) {

		return -EINVAL;

	}