From 218b6b23917c5d04dfacdd0b58f282da8cef14a0 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Wed, 12 Dec 2018 10:04:41 +0100 Subject: [PATCH] utils: Simplify discard max size calculation Signed-off-by: Robert Baldyga --- src/utils/utils_io.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/utils/utils_io.c b/src/utils/utils_io.c index bcec142..4f69d0b 100644 --- a/src/utils/utils_io.c +++ b/src/utils/utils_io.c @@ -77,8 +77,8 @@ int ocf_submit_obj_discard_wait(ocf_data_obj_t obj, uint64_t addr, uint64_t length) { struct ocf_submit_io_wait_context cntx = { }; - uint32_t bytes; - uint32_t max_length = ~0; + uint64_t bytes; + uint64_t max_length = (uint32_t)~0; ENV_BUG_ON(env_memset(&cntx, sizeof(cntx), 0)); env_atomic_set(&cntx.rq_remaining, 1); @@ -92,10 +92,7 @@ int ocf_submit_obj_discard_wait(ocf_data_obj_t obj, uint64_t addr, break; } - if (length > max_length) - bytes = max_length; - else - bytes = length; + bytes = min(length, max_length); env_atomic_inc(&cntx.rq_remaining);