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

iscsi: turn <add/delete name&mask of IG> into functions

Browse Source 
Group the code fragments of add/delete name and mask of initiators
and create spdk_iscsi_init_grp_add/delete_initiators/netmasks()
functions. Memory alloc/free is done in these functions.

Change-Id: I40f2873c5336a05813c0e34797c109386eda4229
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/381246
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ziye Yang <optimistyzy@gmail.com>
This commit is contained in:
Shuhei Matsumoto 2017-10-24 10:01:12 +09:00 committed by Daniel Verkamp
parent e5f7f8ba4a
commit e5c6b9c761
2 changed files with 112 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
lib/iscsi/init_grp.c
View File

@ -65,6 +65,99 @@ spdk_iscsi_init_grp_create(int tag)
return ig;
}
static int
spdk_iscsi_init_grp_add_initiators(struct spdk_iscsi_init_grp *ig, int num_inames, char **inames)
{
int i;
if (num_inames > MAX_INITIATOR) {
SPDK_ERRLOG("%d > MAX_INITIATOR\n", num_inames);
return -EPERM;
}
ig->initiators = calloc(num_inames, sizeof(char *));
if (ig->initiators == NULL) {
return -ENOMEM;
}
ig->ninitiators = num_inames;
for (i = 0; i < ig->ninitiators; i++) {
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "InitiatorName %s\n", inames[i]);
ig->initiators[i] = strdup(inames[i]);
if (ig->initiators[i] == NULL) {
goto cleanup;
}
}
return 0;
cleanup:
for (; i > 0; --i) {
free(ig->initiators[i - 1]);
}
free(ig->initiators);
return -ENOMEM;
}
static void
spdk_iscsi_init_grp_delete_all_initiators(struct spdk_iscsi_init_grp *ig)
{
int i;
for (i = 0; i < ig->ninitiators; i++) {
free(ig->initiators[i]);
}
free(ig->initiators);
}
static int
spdk_iscsi_init_grp_add_netmasks(struct spdk_iscsi_init_grp *ig, int num_imasks, char **imasks)
{
int i;
if (num_imasks > MAX_NETMASK) {
SPDK_ERRLOG("%d > MAX_NETMASK\n", num_imasks);
return -EPERM;
}
ig->netmasks = calloc(num_imasks, sizeof(char *));
if (ig->netmasks == NULL) {
return -ENOMEM;
}
ig->nnetmasks = num_imasks;
for (i = 0; i < ig->nnetmasks; i++) {
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Netmask %s\n", imasks[i]);
ig->netmasks[i] = strdup(imasks[i]);
if (ig->netmasks[i] == NULL) {
goto cleanup;
}
}
return 0;
cleanup:
for (; i > 0; --i) {
free(ig->netmasks[i - 1]);
}
free(ig->netmasks);
return -ENOMEM;
}
static void
spdk_iscsi_init_grp_delete_all_netmasks(struct spdk_iscsi_init_grp *ig)
{
int i;
for (i = 0; i < ig->nnetmasks; i++) {
free(ig->netmasks[i]);
}
free(ig->netmasks);
}
/* Read spdk iscsi target's config file and create initiator group */
int
spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp)
@ -157,10 +250,6 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp)
rc = spdk_iscsi_init_grp_create_from_initiator_list(tag,
num_initiator_names, initiators, num_initiator_masks, netmasks);
if (rc < 0) {
goto cleanup;
}
return rc;
cleanup:
if (initiators) {
@ -194,19 +283,9 @@ spdk_iscsi_init_grp_create_from_initiator_list(int tag,
int num_initiator_masks,
char **initiator_masks)
{
int i, rc = -1;
int rc = -1;
struct spdk_iscsi_init_grp *ig = NULL;
if (num_initiator_names > MAX_INITIATOR) {
SPDK_ERRLOG("%d > MAX_INITIATOR\n", num_initiator_names);
goto cleanup;
}
if (num_initiator_masks > MAX_NETMASK) {
SPDK_ERRLOG("%d > MAX_NETMASK\n", num_initiator_masks);
goto cleanup;
}
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"add initiator group (from initiator list) tag=%d, #initiators=%d, #masks=%d\n",
tag, num_initiator_names, num_initiator_masks);
@ -214,20 +293,23 @@ spdk_iscsi_init_grp_create_from_initiator_list(int tag,
ig = spdk_iscsi_init_grp_create(tag);
if (!ig) {
SPDK_ERRLOG("initiator group create error (%d)\n", tag);
return rc;
}
rc = spdk_iscsi_init_grp_add_initiators(ig, num_initiator_names,
initiator_names);
if (rc < 0) {
SPDK_ERRLOG("add initiator name error\n");
goto cleanup;
}
ig->ninitiators = num_initiator_names;
ig->nnetmasks = num_initiator_masks;
ig->initiators = initiator_names;
for (i = 0; i < num_initiator_names; i++)
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "InitiatorName %s\n",
ig->initiators[i]);
ig->netmasks = initiator_masks;
for (i = 0; i < num_initiator_masks; i++)
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Netmask %s\n",
ig->netmasks[i]);
rc = spdk_iscsi_init_grp_add_netmasks(ig, num_initiator_masks,
initiator_masks);
if (rc < 0) {
SPDK_ERRLOG("add initiator netmask error\n");
spdk_iscsi_init_grp_delete_all_initiators(ig);
goto cleanup;
}
spdk_iscsi_init_grp_register(ig);
@ -241,23 +323,12 @@ cleanup:
void
spdk_iscsi_init_grp_destroy(struct spdk_iscsi_init_grp *ig)
{
int i;
if (!ig) {
return;
}
for (i = 0; i < ig->ninitiators; i++) {
free(ig->initiators[i]);
}
for (i = 0; i < ig->nnetmasks; i++) {
free(ig->netmasks[i]);
}
free(ig->initiators);
free(ig->netmasks);
spdk_iscsi_init_grp_delete_all_initiators(ig);
spdk_iscsi_init_grp_delete_all_netmasks(ig);
free(ig);
};

40
lib/iscsi/iscsi_rpc.c
View File

@ -165,8 +165,6 @@ spdk_rpc_add_initiator_group(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params)
{
struct rpc_initiator_group req = {};
size_t i;
char **initiators = NULL, **netmasks = NULL;
struct spdk_json_write_ctx *w;
if (spdk_json_decode_object(params, rpc_initiator_group_decoders,
@ -180,33 +178,11 @@ spdk_rpc_add_initiator_group(struct spdk_jsonrpc_request *request,
goto invalid;
}
initiators = calloc(req.initiator_list.num_initiators, sizeof(char *));
if (initiators == NULL) {
goto invalid;
}
for (i = 0; i < req.initiator_list.num_initiators; i++) {
initiators[i] = strdup(req.initiator_list.initiators[i]);
if (initiators[i] == NULL) {
goto invalid;
}
}
netmasks = calloc(req.netmask_list.num_netmasks, sizeof(char *));
if (netmasks == NULL) {
goto invalid;
}
for (i = 0; i < req.netmask_list.num_netmasks; i++) {
netmasks[i] = strdup(req.netmask_list.netmasks[i]);
if (netmasks[i] == NULL) {
goto invalid;
}
}
if (spdk_iscsi_init_grp_create_from_initiator_list(req.tag,
req.initiator_list.num_initiators,
initiators,
req.initiator_list.initiators,
req.netmask_list.num_netmasks,
netmasks)) {
req.netmask_list.netmasks)) {
SPDK_ERRLOG("create_from_initiator_list failed\n");
goto invalid;
}
@ -224,18 +200,6 @@ spdk_rpc_add_initiator_group(struct spdk_jsonrpc_request *request,
invalid:
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
if (initiators) {
for (i = 0; i < req.initiator_list.num_initiators; i++) {
free(initiators[i]);
}
free(initiators);
}
if (netmasks) {
for (i = 0; i < req.netmask_list.num_netmasks; i++) {
free(netmasks[i]);
}
free(netmasks);
}
free_rpc_initiator_group(&req);
}
SPDK_RPC_REGISTER("add_initiator_group", spdk_rpc_add_initiator_group)