From a502b88da6d6ae61b30bb797f949d69a74157d73 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 28 Jun 2017 13:31:29 -0700 Subject: [PATCH] env_dpdk: allow spdk_mem_map_free() map to be NULL There was already handling for a NULL map pointer pointer, but the inner pointer wasn't checked. Treat pointer to NULL as a no-op as well to simplify calling code. Change-Id: I0a213233c021957ab2f4b6c1dd304034ca98b868 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/367433 Tested-by: SPDK Automated Test System Reviewed-by: Ziye Yang Reviewed-by: Pawel Wodkowski Reviewed-by: Ben Walker --- lib/env_dpdk/vtophys.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/env_dpdk/vtophys.c b/lib/env_dpdk/vtophys.c index c11cc5ac4..b5ea99ca4 100644 --- a/lib/env_dpdk/vtophys.c +++ b/lib/env_dpdk/vtophys.c @@ -202,6 +202,10 @@ spdk_mem_map_free(struct spdk_mem_map **pmap) map = *pmap; + if (!map) { + return; + } + pthread_mutex_lock(&g_spdk_mem_map_mutex); spdk_mem_map_notify_walk(map, SPDK_MEM_MAP_NOTIFY_UNREGISTER); TAILQ_REMOVE(&g_spdk_mem_maps, map, tailq);