From 00dae3bd2f8641574dff5084603543a9d752fb7f Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Wed, 22 May 2019 16:33:40 +0200 Subject: [PATCH] Use new functions for creating and destroying ocf_ctx Signed-off-by: Robert Baldyga --- modules/cas_cache/context.c | 8 ++++---- modules/cas_cache/context.h | 2 +- ocf | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/cas_cache/context.c b/modules/cas_cache/context.c index aaf9f6d..583d63c 100644 --- a/modules/cas_cache/context.c +++ b/modules/cas_cache/context.c @@ -394,7 +394,7 @@ int cas_initialize_context(void) struct blk_data data; int ret; - ret = ocf_ctx_init(&cas_ctx, &ctx_cfg); + ret = ocf_ctx_create(&cas_ctx, &ctx_cfg); if (ret < 0) return ret; @@ -441,12 +441,12 @@ err_rpool: err_mpool: ocf_mpool_destroy(cas_bvec_pool); err_ctx: - ocf_ctx_exit(cas_ctx); + ocf_ctx_put(cas_ctx); return ret; } -int cas_cleanup_context(void) +void cas_cleanup_context(void) { block_dev_deinit(); atomic_dev_deinit(); @@ -454,7 +454,7 @@ int cas_cleanup_context(void) ocf_mpool_destroy(cas_bvec_pool); cas_rpool_destroy(cas_bvec_pages_rpool, _cas_free_page_rpool, NULL); - return ocf_ctx_exit(cas_ctx); + ocf_ctx_put(cas_ctx); } /* *** CONTEXT DATA HELPER FUNCTION *** */ diff --git a/modules/cas_cache/context.h b/modules/cas_cache/context.h index a8dc588..5c605e3 100644 --- a/modules/cas_cache/context.h +++ b/modules/cas_cache/context.h @@ -74,6 +74,6 @@ void cas_ctx_data_free(ctx_data_t *ctx_data); void cas_ctx_data_secure_erase(ctx_data_t *ctx_data); int cas_initialize_context(void); -int cas_cleanup_context(void); +void cas_cleanup_context(void); #endif /* __CONTEXT_H__ */ diff --git a/ocf b/ocf index 7d493ae..93a0668 160000 --- a/ocf +++ b/ocf @@ -1 +1 @@ -Subproject commit 7d493ae995c3706fe8466f9a5f5c53f6a03401bd +Subproject commit 93a06686a7e2285b674b760c6360a7577556b8c7