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

lib/ftl: Fix memory leak in restore module

Browse Source 
Change-Id: I39c89ef935eeac56fd860b11e1fafd5047072f7e
Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/448023
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Wojciech Malikowski 2019-03-14 06:17:58 -04:00 committed by Jim Harris
parent d058328e12
commit 11c8fbcf62
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ftl/ftl_restore.c
View File

@ -62,6 +62,8 @@ struct ftl_restore {
void *md_buf; void *md_buf;
void *lba_map; void *lba_map;
bool l2p_phase;
}; };
static int static int
@ -94,6 +96,7 @@ ftl_restore_init(struct spdk_ftl_dev *dev, ftl_restore_fn cb)
restore->dev = dev; restore->dev = dev;
restore->cb = cb; restore->cb = cb;
restore->l2p_phase = false;
restore->bands = calloc(ftl_dev_num_bands(dev), sizeof(*restore->bands)); restore->bands = calloc(ftl_dev_num_bands(dev), sizeof(*restore->bands));
if (!restore->bands) { if (!restore->bands) {
@ -131,9 +134,10 @@ static void
ftl_restore_complete(struct ftl_restore *restore, int status) ftl_restore_complete(struct ftl_restore *restore, int status)
{ {
struct ftl_restore *ctx = status ? NULL : restore; struct ftl_restore *ctx = status ? NULL : restore;
bool l2p_phase = restore->l2p_phase;
restore->cb(restore->dev, ctx, status); restore->cb(restore->dev, ctx, status);
if (status) { if (status || l2p_phase) {
ftl_restore_free(restore); ftl_restore_free(restore);
} }
} }
@ -409,6 +413,7 @@ ftl_restore_device(struct ftl_restore *restore, ftl_restore_fn cb)
{ {
struct ftl_restore_band *rband; struct ftl_restore_band *rband;
restore->l2p_phase = true;
restore->current = 0; restore->current = 0;
restore->cb = cb; restore->cb = cb;