From 4d25bbe4b305ad6e8acfea3c0b79cd77d7563d75 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Fri, 24 Jan 2020 11:18:39 +0100 Subject: [PATCH 1/2] metadata: Relax memory allocation requirements Signed-off-by: Robert Baldyga --- src/metadata/metadata_io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/metadata/metadata_io.c b/src/metadata/metadata_io.c index 3457e0b..bbd12f7 100644 --- a/src/metadata/metadata_io.c +++ b/src/metadata/metadata_io.c @@ -298,7 +298,7 @@ void metadata_io_req_finalize(struct metadata_io_request *m_req) struct metadata_io_request_asynch *a_req = m_req->asynch; if (env_atomic_dec_return(&a_req->req_active) == 0) - env_free(a_req); + env_vfree(a_req); } static uint32_t metadata_io_max_page(ocf_cache_t cache) @@ -376,7 +376,7 @@ static int metadata_io_i_asynch(ocf_cache_t cache, ocf_queue_t queue, int dir, if (count == 0) return 0; - a_req = env_zalloc(sizeof(*a_req), ENV_MEM_NOIO); + a_req = env_vzalloc(sizeof(*a_req)); if (!a_req) return -OCF_ERR_NO_MEM; @@ -430,7 +430,7 @@ static int metadata_io_i_asynch(ocf_cache_t cache, ocf_queue_t queue, int dir, err: while (i--) ctx_data_free(cache->owner, a_req->reqs[i].data); - env_free(a_req); + env_vfree(a_req); return -OCF_ERR_NO_MEM; } From 7d82f206148c0cce6e985846ccd3a6cc93e96390 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Fri, 24 Jan 2020 11:19:06 +0100 Subject: [PATCH 2/2] Remove unused include Signed-off-by: Robert Baldyga --- src/metadata/metadata_io.c | 1 - src/metadata/metadata_updater.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/metadata/metadata_io.c b/src/metadata/metadata_io.c index bbd12f7..2a20871 100644 --- a/src/metadata/metadata_io.c +++ b/src/metadata/metadata_io.c @@ -9,7 +9,6 @@ #include "../engine/engine_common.h" #include "../engine/engine_bf.h" #include "../utils/utils_cache_line.h" -#include "../utils/utils_realloc.h" #include "../utils/utils_io.h" #include "../ocf_request.h" #include "../ocf_def_priv.h" diff --git a/src/metadata/metadata_updater.c b/src/metadata/metadata_updater.c index 4e00224..bb720e3 100644 --- a/src/metadata/metadata_updater.c +++ b/src/metadata/metadata_updater.c @@ -11,7 +11,6 @@ #include "../ocf_cache_priv.h" #include "../ocf_ctx_priv.h" #include "../utils/utils_io.h" -#include "../utils/utils_realloc.h" int ocf_metadata_updater_init(ocf_cache_t cache) {