Commit bb2486a4 authored by yidong0635's avatar yidong0635 Committed by Jim Harris
Browse files

nvmf: change the return type of calloc failed 



1.nvmf: change the return type of calloc failed to -ENOMEM and
keep consistency in this file.
2.thread: revise rc condition to ( rc!= 0),to deal with
all abnormal return.

Change-Id: I7cccb548f30448eaa1bac1a5904c3edcad9c1208
Signed-off-by: default avataryidong0635 <dongx.yi@intel.com>
Reviewed-on: https://review.gerrithub.io/431459


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
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 ea0744f4

lib/nvmf/nvmf.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ spdk_nvmf_tgt_create_poll_group(void *io_device, void *ctx_buf) 
	group->num_sgroups = tgt->opts.max_subsystems;

	group->sgroups = calloc(tgt->opts.max_subsystems, sizeof(struct spdk_nvmf_subsystem_poll_group));

	if (!group->sgroups) {

		return -1;

		return -ENOMEM;

	}



	for (sid = 0; sid < tgt->opts.max_subsystems; sid++) {

lib/thread/thread.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ spdk_get_io_channel(void *io_device) 
	pthread_mutex_unlock(&g_devlist_mutex);



	rc = dev->create_cb(io_device, (uint8_t *)ch + sizeof(*ch));

	if (rc == -1) {

	if (rc != 0) {

		pthread_mutex_lock(&g_devlist_mutex);

		TAILQ_REMOVE(&ch->thread->io_channels, ch, tailq);

		dev->refcnt--;