From 21e98a6dbc9ac12da1d76b43de7c93800c013e2e Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Wed, 4 Nov 2020 02:34:01 -0500 Subject: [PATCH] Evict request's target partition in regrular order Instead of evicting target partition as the last one, respect eviction priorities Signed-off-by: Michal Mielewczyk --- src/eviction/eviction.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/eviction/eviction.c b/src/eviction/eviction.c index 8ee5b59..51f2ec9 100644 --- a/src/eviction/eviction.c +++ b/src/eviction/eviction.c @@ -83,10 +83,6 @@ static inline uint32_t ocf_evict_do(ocf_cache_t cache, /* It seams that no more partition for eviction */ break; } - if (part_id == target_part->id) { - /* Omit targeted, evict from different first */ - continue; - } if (evicted >= evict_cline_no) { /* Evicted requested number of cache line, stop */ goto out; @@ -102,18 +98,6 @@ static inline uint32_t ocf_evict_do(ocf_cache_t cache, part, to_evict); } - if (!ocf_eviction_can_evict(cache)) - goto out; - - if (evicted < evict_cline_no) { - /* Now we can evict form targeted partition */ - to_evict = ocf_evict_calculate(target_part, evict_cline_no); - if (to_evict) { - evicted += ocf_eviction_need_space(cache, io_queue, - target_part, to_evict); - } - } - out: return evicted; }