d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bdev/iscsi: unregister io_device on bdev destruction

Browse Source 
Fixes a memory leak and a possible data race.

Change-Id: Ib094ca62e66d8d3a88b0acccc92e69214d413e72
Signed-off-by: Dariusz 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: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2018-07-26 20:01:08 +02:00 committed by Ben Walker
parent dbd4e57994
commit 5a5630acb2
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/bdev/iscsi/bdev_iscsi.c
View File

@ -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