From 7fbc5106e43d71951a18aad998397a4151f82b3e Mon Sep 17 00:00:00 2001 From: wuzhouhui Date: Fri, 14 Dec 2018 15:18:29 +0800 Subject: [PATCH] reduce: put pmem_unmap() in _init_load_cleanup() In effect, this commit fixes error path of spdk_reduce_vol_init() and spdk_reduce_vol_load(): forget to unmap pmem file after mapped. Change-Id: I797f15e315fff3ff42c17509a73dc46e7f6bdb24 Signed-off-by: wuzhouhui Reviewed-on: https://review.gerrithub.io/437270 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/reduce/reduce.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/reduce/reduce.c b/lib/reduce/reduce.c index 21af47f00..123b115e4 100644 --- a/lib/reduce/reduce.c +++ b/lib/reduce/reduce.c @@ -314,6 +314,7 @@ _init_load_cleanup(struct spdk_reduce_vol *vol, struct reduce_init_load_ctx *ctx } if (vol != NULL) { + pmem_unmap(vol->pm_file.pm_buf, vol->pm_file.size); spdk_dma_free(vol->backing_super); spdk_bit_array_free(&vol->allocated_chunk_maps); spdk_bit_array_free(&vol->allocated_backing_io_units); @@ -673,8 +674,6 @@ spdk_reduce_vol_unload(struct spdk_reduce_vol *vol, return; } - pmem_unmap(vol->pm_file.pm_buf, vol->pm_file.size); - vol->backing_dev->close(vol->backing_dev); _init_load_cleanup(vol, NULL);