diff --git a/inc/ocf_io.h b/inc/ocf_io.h index 89a82cf..b9c9825 100644 --- a/inc/ocf_io.h +++ b/inc/ocf_io.h @@ -45,15 +45,6 @@ typedef void (*ocf_handle_io_t)(ocf_io_t io, void *opaque); */ typedef void (*ocf_end_io_t)(ocf_io_t io, void *priv1, void *priv2, int error); -/** - * @brief Increase reference counter in OCF IO - * - * @note Wrapper for get IO operation - * - * @param[in] io OCF IO - */ -void ocf_io_get(ocf_io_t io); - /** * @brief Decrease reference counter in OCF IO * diff --git a/src/ocf_core.c b/src/ocf_core.c index 217312e..bdf7378 100644 --- a/src/ocf_core.c +++ b/src/ocf_core.c @@ -213,8 +213,7 @@ static void ocf_req_complete(struct ocf_request *req, int error) dec_counter_if_req_was_dirty(req); - /* Invalidate OCF IO, it is not valid after completion */ - ocf_io_put(req); + ocf_req_put(req); } static inline ocf_req_cache_mode_t _ocf_core_req_resolve_fast_mode( @@ -281,7 +280,7 @@ static void ocf_core_volume_submit_io(ocf_io_t io) req->complete = ocf_req_complete; - ocf_io_get(io); + ocf_req_get(req); if (unlikely(req->d2c)) { ocf_core_update_stats(core, io); @@ -323,7 +322,7 @@ static void ocf_core_volume_submit_io(ocf_io_t io) err: ocf_io_end_func(io, ret); - ocf_io_put(req); + ocf_req_put(req); } static void ocf_core_volume_submit_flush(ocf_io_t io) @@ -349,7 +348,7 @@ static void ocf_core_volume_submit_flush(ocf_io_t io) req->complete = ocf_req_complete; - ocf_io_get(io); + ocf_req_get(req); if (unlikely(req->d2c)) { ocf_d2c_flush_fast(req); @@ -387,7 +386,7 @@ static void ocf_core_volume_submit_discard(ocf_io_t io) req->complete = ocf_req_complete; - ocf_io_get(io); + ocf_req_get(req); if (unlikely(req->d2c)) { ocf_d2c_discard_fast(req); diff --git a/src/ocf_io.c b/src/ocf_io.c index c8a801e..69d4e0f 100644 --- a/src/ocf_io.c +++ b/src/ocf_io.c @@ -125,13 +125,6 @@ uint32_t ocf_io_get_offset(ocf_io_t io) return req->offset; } -void ocf_io_get(ocf_io_t io) -{ - struct ocf_request *req = ocf_io_to_req(io); - - env_atomic_inc_return(&req->io.ref_count); -} - void ocf_io_put(ocf_io_t io) { struct ocf_request *req = ocf_io_to_req(io); diff --git a/tests/functional/pyocf/types/io.py b/tests/functional/pyocf/types/io.py index 92dff06..0e51afd 100644 --- a/tests/functional/pyocf/types/io.py +++ b/tests/functional/pyocf/types/io.py @@ -81,9 +81,6 @@ class Io(Structure): def put(self): OcfLib.getInstance().ocf_io_put(byref(self)) - def get(self): - OcfLib.getInstance().ocf_io_get(byref(self)) - @staticmethod @END def c_end(io, priv1, priv2, err):