Commit 5a5630ac authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Ben Walker
Browse files

bdev/iscsi: unregister io_device on bdev destruction 



Fixes a memory leak and a possible data race.

Change-Id: Ib094ca62e66d8d3a88b0acccc92e69214d413e72
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/420573


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent dbd4e579

lib/bdev/iscsi/bdev_iscsi.c

+7 −9
Original line number Diff line number Diff line
@@ -128,21 +128,20 @@ bdev_iscsi_get_ctx_size(void) 
	return sizeof(struct bdev_iscsi_io);

}



static void iscsi_free_lun(struct bdev_iscsi_lun *lun)

static void

_iscsi_free_lun(void *arg)

{

	struct bdev_iscsi_lun *lun = arg;



	assert(lun != NULL);

	iscsi_destroy_context(lun->context);

	pthread_mutex_destroy(&lun->mutex);

	free(lun->bdev.name);

	free(lun->url);

	free(lun->initiator_iqn);

	free(lun);

}



static void

bdev_iscsi_lun_cleanup(struct bdev_iscsi_lun *lun)

{

	iscsi_destroy_context(lun->context);

	iscsi_free_lun(lun);

	spdk_bdev_destruct_done(&lun->bdev, 0);

}



static void
@@ -270,8 +269,7 @@ bdev_iscsi_destruct_cb(void *ctx) 
	struct bdev_iscsi_lun *lun = ctx;



	spdk_poller_unregister(&lun->no_master_ch_poller);

	spdk_bdev_destruct_done(&lun->bdev, 0);

	bdev_iscsi_lun_cleanup(lun);

	spdk_io_device_unregister(lun, _iscsi_free_lun);

}



static int