From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 1 Oct 2015 19:30:06 +0000 (-0500)
Subject: res_sorcery_memory_cache.c: Replace inline code with function.
X-Git-Tag: 13.7.0-rc1~128^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfeb513e85d13550d81b40df5e95333c1ad5c61c;p=thirdparty%2Fasterisk.git

res_sorcery_memory_cache.c: Replace inline code with function.

Make sorcery_memory_cache_close() call remove_all_from_cache() instead of
partially inlining it.

ASTERISK-25441

Change-Id: I1aa6cb425b1a4307096f3f914d17af8ec179a74c
---

diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c
index bc385b4ae3..7c7d5708e2 100644
--- a/res/res_sorcery_memory_cache.c
+++ b/res/res_sorcery_memory_cache.c
@@ -1061,9 +1061,7 @@ static void sorcery_memory_cache_close(void *data)
 		 * a prolonged period of time.
 		 */
 		ao2_wrlock(cache->objects);
-		ao2_callback(cache->objects, OBJ_UNLINK | OBJ_NOLOCK | OBJ_NODATA | OBJ_MULTIPLE,
-			NULL, NULL);
-		AST_SCHED_DEL_UNREF(sched, cache->expire_id, ao2_ref(cache, -1));
+		remove_all_from_cache(cache);
 		ao2_unlock(cache->objects);
 	}