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

lib/iscsi: Rename iSCSI global data from g_spdk_iscsi to g_iscsi 



The following patch will remove the "spdk_" prefix from iSCSI
internal APIs. The iSCSI global data g_spdk_iscsi is also local in
SPDK iSCSI library. Hence rename it by g_iscsi for consistency.

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


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>
parent 11e25ed2

lib/iscsi/conn.c

+9 −9
Original line number Diff line number Diff line
@@ -220,9 +220,9 @@ spdk_iscsi_conn_construct(struct spdk_iscsi_portal *portal, 
		return -1;

	}



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	conn->timeout = g_spdk_iscsi.timeout * spdk_get_ticks_hz(); /* seconds to TSC */

	conn->nopininterval = g_spdk_iscsi.nopininterval;

	pthread_mutex_lock(&g_iscsi.mutex);

	conn->timeout = g_iscsi.timeout * spdk_get_ticks_hz(); /* seconds to TSC */

	conn->nopininterval = g_iscsi.nopininterval;

	conn->nopininterval *= spdk_get_ticks_hz(); /* seconds to TSC */

	conn->nop_outstanding = false;

	conn->data_out_cnt = 0;
@@ -231,7 +231,7 @@ spdk_iscsi_conn_construct(struct spdk_iscsi_portal *portal, 
	conn->require_chap = portal->group->require_chap;

	conn->mutual_chap = portal->group->mutual_chap;

	conn->chap_group = portal->group->chap_group;

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);

	conn->MaxRecvDataSegmentLength = 8192; /* RFC3720(12.12) */



	conn->portal = portal;
@@ -294,7 +294,7 @@ spdk_iscsi_conn_construct(struct spdk_iscsi_portal *portal, 
	conn->pending_task_cnt = 0;



	/* Get the first poll group. */

	pg = TAILQ_FIRST(&g_spdk_iscsi.poll_group_head);

	pg = TAILQ_FIRST(&g_iscsi.poll_group_head);

	if (pg == NULL) {

		SPDK_ERRLOG("There is no poll group.\n");

		assert(false);
@@ -376,7 +376,7 @@ iscsi_conn_cleanup_backend(struct spdk_iscsi_conn *conn) 


	if (conn->sess->connections > 1) {

		/* connection specific cleanup */

	} else if (!g_spdk_iscsi.AllowDuplicateIsid) {

	} else if (!g_iscsi.AllowDuplicateIsid) {

		/* clean up all tasks to all LUNs for session */

		target = conn->sess->target;

		if (target != NULL) {
@@ -1579,7 +1579,7 @@ spdk_iscsi_conn_schedule(struct spdk_iscsi_conn *conn) 
		 * thread. */

		return;

	}

	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);



	target = conn->sess->target;

	pthread_mutex_lock(&target->mutex);
@@ -1590,7 +1590,7 @@ spdk_iscsi_conn_schedule(struct spdk_iscsi_conn *conn) 
		 *  Pick a poll group using round-robin.

		 */

		if (g_next_pg == NULL) {

			g_next_pg = TAILQ_FIRST(&g_spdk_iscsi.poll_group_head);

			g_next_pg = TAILQ_FIRST(&g_iscsi.poll_group_head);

			assert(g_next_pg != NULL);

		}
@@ -1607,7 +1607,7 @@ spdk_iscsi_conn_schedule(struct spdk_iscsi_conn *conn) 
	}



	pthread_mutex_unlock(&target->mutex);

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	assert(spdk_io_channel_get_thread(spdk_io_channel_from_ctx(conn->pg)) ==

	       spdk_get_thread());

lib/iscsi/init_grp.c

+22 −22
Original line number Diff line number Diff line
@@ -449,13 +449,13 @@ spdk_iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig) 


	assert(ig != NULL);



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);

	tmp = spdk_iscsi_init_grp_find_by_tag(ig->tag);

	if (tmp == NULL) {

		TAILQ_INSERT_TAIL(&g_spdk_iscsi.ig_head, ig, tailq);

		TAILQ_INSERT_TAIL(&g_iscsi.ig_head, ig, tailq);

		rc = 0;

	}

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	return rc;

}
@@ -525,10 +525,10 @@ spdk_iscsi_init_grp_add_initiators_from_initiator_list(int tag, 
		      "add initiator to initiator group: tag=%d, #initiators=%d, #masks=%d\n",

		      tag, num_initiator_names, num_initiator_masks);



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);

	ig = spdk_iscsi_init_grp_find_by_tag(tag);

	if (!ig) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);

		SPDK_ERRLOG("initiator group (%d) is not found\n", tag);

		return rc;

	}
@@ -549,7 +549,7 @@ spdk_iscsi_init_grp_add_initiators_from_initiator_list(int tag, 
	}



error:

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);

	return rc;

}
@@ -567,10 +567,10 @@ spdk_iscsi_init_grp_delete_initiators_from_initiator_list(int tag, 
		      "delete initiator from initiator group: tag=%d, #initiators=%d, #masks=%d\n",

		      tag, num_initiator_names, num_initiator_masks);



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);

	ig = spdk_iscsi_init_grp_find_by_tag(tag);

	if (!ig) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);

		SPDK_ERRLOG("initiator group (%d) is not found\n", tag);

		return rc;

	}
@@ -592,7 +592,7 @@ spdk_iscsi_init_grp_delete_initiators_from_initiator_list(int tag, 
	}



error:

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);

	return rc;

}
@@ -613,7 +613,7 @@ spdk_iscsi_init_grp_find_by_tag(int tag) 
{

	struct spdk_iscsi_init_grp *ig;



	TAILQ_FOREACH(ig, &g_spdk_iscsi.ig_head, tailq) {

	TAILQ_FOREACH(ig, &g_iscsi.ig_head, tailq) {

		if (ig->tag == tag) {

			return ig;

		}
@@ -652,12 +652,12 @@ spdk_iscsi_init_grps_destroy(void) 
	struct spdk_iscsi_init_grp *ig, *tmp;



	SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "spdk_iscsi_init_grp_array_destroy\n");

	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	TAILQ_FOREACH_SAFE(ig, &g_spdk_iscsi.ig_head, tailq, tmp) {

		TAILQ_REMOVE(&g_spdk_iscsi.ig_head, ig, tailq);

	pthread_mutex_lock(&g_iscsi.mutex);

	TAILQ_FOREACH_SAFE(ig, &g_iscsi.ig_head, tailq, tmp) {

		TAILQ_REMOVE(&g_iscsi.ig_head, ig, tailq);

		spdk_iscsi_init_grp_destroy(ig);

	}

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);

}



struct spdk_iscsi_init_grp *
@@ -665,15 +665,15 @@ spdk_iscsi_init_grp_unregister(int tag) 
{

	struct spdk_iscsi_init_grp *ig;



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	TAILQ_FOREACH(ig, &g_spdk_iscsi.ig_head, tailq) {

	pthread_mutex_lock(&g_iscsi.mutex);

	TAILQ_FOREACH(ig, &g_iscsi.ig_head, tailq) {

		if (ig->tag == tag) {

			TAILQ_REMOVE(&g_spdk_iscsi.ig_head, ig, tailq);

			pthread_mutex_unlock(&g_spdk_iscsi.mutex);

			TAILQ_REMOVE(&g_iscsi.ig_head, ig, tailq);

			pthread_mutex_unlock(&g_iscsi.mutex);

			return ig;

		}

	}

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);

	return NULL;

}
@@ -706,7 +706,7 @@ spdk_iscsi_init_grps_config_text(FILE *fp) 
	fprintf(fp, "%s", initiator_group_section);



	/* Dump initiator groups */

	TAILQ_FOREACH(ig, &g_spdk_iscsi.ig_head, tailq) {

	TAILQ_FOREACH(ig, &g_iscsi.ig_head, tailq) {

		if (NULL == ig) { continue; }

		fprintf(fp, INITIATOR_GROUP_TMPL, ig->tag, ig->tag);
@@ -771,7 +771,7 @@ spdk_iscsi_init_grps_info_json(struct spdk_json_write_ctx *w) 
{

	struct spdk_iscsi_init_grp *ig;



	TAILQ_FOREACH(ig, &g_spdk_iscsi.ig_head, tailq) {

	TAILQ_FOREACH(ig, &g_iscsi.ig_head, tailq) {

		iscsi_init_grp_info_json(ig, w);

	}

}
@@ -781,7 +781,7 @@ spdk_iscsi_init_grps_config_json(struct spdk_json_write_ctx *w) 
{

	struct spdk_iscsi_init_grp *ig;



	TAILQ_FOREACH(ig, &g_spdk_iscsi.ig_head, tailq) {

	TAILQ_FOREACH(ig, &g_iscsi.ig_head, tailq) {

		iscsi_init_grp_config_json(ig, w);

	}

}

lib/iscsi/iscsi.c

+29 −29
Original line number Diff line number Diff line
@@ -67,14 +67,14 @@ 
#define HAVE_ARC4RANDOM 1

#endif



struct spdk_iscsi_globals g_spdk_iscsi = {

struct spdk_iscsi_globals g_iscsi = {

	.mutex = PTHREAD_MUTEX_INITIALIZER,

	.portal_head = TAILQ_HEAD_INITIALIZER(g_spdk_iscsi.portal_head),

	.pg_head = TAILQ_HEAD_INITIALIZER(g_spdk_iscsi.pg_head),

	.ig_head = TAILQ_HEAD_INITIALIZER(g_spdk_iscsi.ig_head),

	.target_head = TAILQ_HEAD_INITIALIZER(g_spdk_iscsi.target_head),

	.auth_group_head = TAILQ_HEAD_INITIALIZER(g_spdk_iscsi.auth_group_head),

	.poll_group_head = TAILQ_HEAD_INITIALIZER(g_spdk_iscsi.poll_group_head),

	.portal_head = TAILQ_HEAD_INITIALIZER(g_iscsi.portal_head),

	.pg_head = TAILQ_HEAD_INITIALIZER(g_iscsi.pg_head),

	.ig_head = TAILQ_HEAD_INITIALIZER(g_iscsi.ig_head),

	.target_head = TAILQ_HEAD_INITIALIZER(g_iscsi.target_head),

	.auth_group_head = TAILQ_HEAD_INITIALIZER(g_iscsi.auth_group_head),

	.poll_group_head = TAILQ_HEAD_INITIALIZER(g_iscsi.poll_group_head),

};



#define MATCH_DIGEST_WORD(BUF, CRC32C) \
@@ -546,7 +546,7 @@ void spdk_free_sess(struct spdk_iscsi_sess *sess) 
	spdk_iscsi_param_free(sess->params);

	free(sess->conns);

	spdk_scsi_port_free(&sess->initiator_port);

	spdk_mempool_put(g_spdk_iscsi.session_pool, (void *)sess);

	spdk_mempool_put(g_iscsi.session_pool, (void *)sess);

}



static int
@@ -557,30 +557,30 @@ create_iscsi_sess(struct spdk_iscsi_conn *conn, 
	struct spdk_iscsi_sess *sess;

	int rc;



	sess = spdk_mempool_get(g_spdk_iscsi.session_pool);

	sess = spdk_mempool_get(g_iscsi.session_pool);

	if (!sess) {

		SPDK_ERRLOG("Unable to get session object\n");

		SPDK_ERRLOG("MaxSessions set to %d\n", g_spdk_iscsi.MaxSessions);

		SPDK_ERRLOG("MaxSessions set to %d\n", g_iscsi.MaxSessions);

		return -ENOMEM;

	}



	/* configuration values */

	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);



	sess->MaxConnections = g_spdk_iscsi.MaxConnectionsPerSession;

	sess->MaxConnections = g_iscsi.MaxConnectionsPerSession;

	sess->MaxOutstandingR2T = DEFAULT_MAXOUTSTANDINGR2T;



	sess->DefaultTime2Wait = g_spdk_iscsi.DefaultTime2Wait;

	sess->DefaultTime2Retain = g_spdk_iscsi.DefaultTime2Retain;

	sess->FirstBurstLength = g_spdk_iscsi.FirstBurstLength;

	sess->DefaultTime2Wait = g_iscsi.DefaultTime2Wait;

	sess->DefaultTime2Retain = g_iscsi.DefaultTime2Retain;

	sess->FirstBurstLength = g_iscsi.FirstBurstLength;

	sess->MaxBurstLength = SPDK_ISCSI_MAX_BURST_LENGTH;

	sess->InitialR2T = DEFAULT_INITIALR2T;

	sess->ImmediateData = g_spdk_iscsi.ImmediateData;

	sess->ImmediateData = g_iscsi.ImmediateData;

	sess->DataPDUInOrder = DEFAULT_DATAPDUINORDER;

	sess->DataSequenceInOrder = DEFAULT_DATASEQUENCEINORDER;

	sess->ErrorRecoveryLevel = g_spdk_iscsi.ErrorRecoveryLevel;

	sess->ErrorRecoveryLevel = g_iscsi.ErrorRecoveryLevel;



	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	sess->tag = conn->pg_tag;
@@ -708,11 +708,11 @@ get_iscsi_sess_by_tsih(uint16_t tsih) 
{

	struct spdk_iscsi_sess *session;



	if (tsih == 0 || tsih > g_spdk_iscsi.MaxSessions) {

	if (tsih == 0 || tsih > g_iscsi.MaxSessions) {

		return NULL;

	}



	session = g_spdk_iscsi.session[tsih - 1];

	session = g_iscsi.session[tsih - 1];

	assert(tsih == session->tsih);



	return session;
@@ -1073,9 +1073,9 @@ iscsi_check_values(struct spdk_iscsi_conn *conn) 
			    conn->sess->MaxBurstLength);

		return -1;

	}

	if (conn->sess->FirstBurstLength > g_spdk_iscsi.FirstBurstLength) {

	if (conn->sess->FirstBurstLength > g_iscsi.FirstBurstLength) {

		SPDK_ERRLOG("FirstBurstLength(%d) > iSCSI target restriction(%d)\n",

			    conn->sess->FirstBurstLength, g_spdk_iscsi.FirstBurstLength);

			    conn->sess->FirstBurstLength, g_iscsi.FirstBurstLength);

		return -1;

	}

	if (conn->sess->MaxBurstLength > 0x00ffffff) {
@@ -1514,7 +1514,7 @@ iscsi_op_login_check_session(struct spdk_iscsi_conn *conn, 
			rsph->status_detail = rc;

			return SPDK_ISCSI_LOGIN_ERROR_RESPONSE;

		}

	} else if (!g_spdk_iscsi.AllowDuplicateIsid) {

	} else if (!g_iscsi.AllowDuplicateIsid) {

		/* new session, drop old sess by the initiator */

		spdk_iscsi_drop_conns(conn, initiator_port_name, 0 /* drop old */);

	}
@@ -1687,9 +1687,9 @@ iscsi_op_login_session_normal(struct spdk_iscsi_conn *conn, 
			 target_short_name);

	}



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);

	rc = iscsi_op_login_check_target(conn, rsp_pdu, target_name, &target);

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	if (rc < 0) {

		return rc;
@@ -1914,9 +1914,9 @@ iscsi_op_login_phase_none(struct spdk_iscsi_conn *conn, 
		rsph->tsih = 0;



		/* force target flags */

		pthread_mutex_lock(&g_spdk_iscsi.mutex);

		pthread_mutex_lock(&g_iscsi.mutex);

		rc = iscsi_op_login_session_discovery_chap(conn);

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);

		if (rc < 0) {

			return rc;

		}
@@ -4737,10 +4737,10 @@ iscsi_read_pdu(struct spdk_iscsi_conn *conn) 


			if (data_len != 0 && pdu->data_buf == NULL) {

				if (data_len <= spdk_get_max_immediate_data_size()) {

					pool = g_spdk_iscsi.pdu_immediate_data_pool;

					pool = g_iscsi.pdu_immediate_data_pool;

					pdu->data_buf_len = SPDK_BDEV_BUF_SIZE_WITH_MD(spdk_get_max_immediate_data_size());

				} else if (data_len <= SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH) {

					pool = g_spdk_iscsi.pdu_data_out_pool;

					pool = g_iscsi.pdu_data_out_pool;

					pdu->data_buf_len = SPDK_BDEV_BUF_SIZE_WITH_MD(SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH);

				} else {

					SPDK_ERRLOG("Data(%d) > MaxSegment(%d)\n",

lib/iscsi/iscsi.h

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ enum spdk_error_codes { 


#define xstrdup(s) (s ? strdup(s) : (char *)NULL)



extern struct spdk_iscsi_globals g_spdk_iscsi;

extern struct spdk_iscsi_globals g_iscsi;

extern struct spdk_iscsi_opts *g_spdk_iscsi_opts;



struct spdk_iscsi_task;
@@ -457,7 +457,7 @@ spdk_get_max_immediate_data_size(void) 
	 *  take up much space and we need to make sure the worst-case scenario

	 *  can be satisified by the size returned here.

	 */

	return g_spdk_iscsi.FirstBurstLength +

	return g_iscsi.FirstBurstLength +

	       ISCSI_DIGEST_LEN + /* data digest */

	       ISCSI_DIGEST_LEN + /* header digest */

	       8 +		   /* bidirectional AHS */

lib/iscsi/iscsi_rpc.c

+19 −19
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ spdk_rpc_iscsi_portal_group_set_auth(struct spdk_jsonrpc_request *request, 
		return;

	}



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);



	pg = spdk_iscsi_portal_grp_find_by_tag(req.tag);

	if (pg == NULL) {
@@ -940,7 +940,7 @@ spdk_rpc_iscsi_portal_group_set_auth(struct spdk_jsonrpc_request *request, 
		goto exit;

	}



	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	w = spdk_jsonrpc_begin_result(request);

	spdk_json_write_bool(w, true);
@@ -949,7 +949,7 @@ spdk_rpc_iscsi_portal_group_set_auth(struct spdk_jsonrpc_request *request, 
	return;



exit:

	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);

}

SPDK_RPC_REGISTER("iscsi_portal_group_set_auth", spdk_rpc_iscsi_portal_group_set_auth,

		  SPDK_RPC_RUNTIME)
@@ -1009,7 +1009,7 @@ spdk_rpc_iscsi_get_connections(struct spdk_jsonrpc_request *request, 


	spdk_json_write_array_begin(ctx->w);



	spdk_for_each_channel(&g_spdk_iscsi,

	spdk_for_each_channel(&g_iscsi,

			      rpc_iscsi_get_connections,

			      ctx,

			      rpc_iscsi_get_connections_done);
@@ -1308,11 +1308,11 @@ spdk_rpc_iscsi_create_auth_group(struct spdk_jsonrpc_request *request, 
		return;

	}



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);



	rc = spdk_iscsi_add_auth_group(req.tag, &group);

	if (rc != 0) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);



		spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						     "Could not add auth group (%d), %s",
@@ -1327,7 +1327,7 @@ spdk_rpc_iscsi_create_auth_group(struct spdk_jsonrpc_request *request, 
						      _secret->muser, _secret->msecret);

		if (rc != 0) {

			spdk_iscsi_delete_auth_group(group);

			pthread_mutex_unlock(&g_spdk_iscsi.mutex);

			pthread_mutex_unlock(&g_iscsi.mutex);



			spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

							     "Could not add secret to auth group (%d), %s",
@@ -1337,7 +1337,7 @@ spdk_rpc_iscsi_create_auth_group(struct spdk_jsonrpc_request *request, 
		}

	}



	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	free_rpc_auth_group(&req);
@@ -1372,11 +1372,11 @@ spdk_rpc_iscsi_delete_auth_group(struct spdk_jsonrpc_request *request, 
		return;

	}



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);



	group = spdk_iscsi_find_auth_group_by_tag(req.tag);

	if (group == NULL) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);



		spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						     "Could not find auth group (%d)", req.tag);
@@ -1385,7 +1385,7 @@ spdk_rpc_iscsi_delete_auth_group(struct spdk_jsonrpc_request *request, 


	spdk_iscsi_delete_auth_group(group);



	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	w = spdk_jsonrpc_begin_result(request);

	spdk_json_write_bool(w, true);
@@ -1437,11 +1437,11 @@ spdk_rpc_iscsi_auth_group_add_secret(struct spdk_jsonrpc_request *request, 
		return;

	}



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);



	group = spdk_iscsi_find_auth_group_by_tag(req.tag);

	if (group == NULL) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);



		spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						     "Could not find auth group (%d)", req.tag);
@@ -1451,7 +1451,7 @@ spdk_rpc_iscsi_auth_group_add_secret(struct spdk_jsonrpc_request *request, 


	rc = spdk_iscsi_auth_group_add_secret(group, req.user, req.secret, req.muser, req.msecret);

	if (rc != 0) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);



		spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						     "Could not add secret to auth group (%d), %s",
@@ -1460,7 +1460,7 @@ spdk_rpc_iscsi_auth_group_add_secret(struct spdk_jsonrpc_request *request, 
		return;

	}



	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	free_rpc_add_auth_secret(&req);
@@ -1507,11 +1507,11 @@ spdk_rpc_iscsi_auth_group_remove_secret(struct spdk_jsonrpc_request *request, 
		return;

	}



	pthread_mutex_lock(&g_spdk_iscsi.mutex);

	pthread_mutex_lock(&g_iscsi.mutex);



	group = spdk_iscsi_find_auth_group_by_tag(req.tag);

	if (group == NULL) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);



		spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						     "Could not find auth group (%d)", req.tag);
@@ -1521,7 +1521,7 @@ spdk_rpc_iscsi_auth_group_remove_secret(struct spdk_jsonrpc_request *request, 


	rc = spdk_iscsi_auth_group_delete_secret(group, req.user);

	if (rc != 0) {

		pthread_mutex_unlock(&g_spdk_iscsi.mutex);

		pthread_mutex_unlock(&g_iscsi.mutex);



		spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						     "Could not delete secret from CHAP group (%d), %s",
@@ -1530,7 +1530,7 @@ spdk_rpc_iscsi_auth_group_remove_secret(struct spdk_jsonrpc_request *request, 
		return;

	}



	pthread_mutex_unlock(&g_spdk_iscsi.mutex);

	pthread_mutex_unlock(&g_iscsi.mutex);



	free_rpc_remove_auth_secret(&req);