From f60f318450fd8118b96e3dbae29cccc68ed1ae19 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Tue, 26 Sep 2023 11:30:54 +0800 Subject: [PATCH] crimson/os/seastore/cache: replace is_clean by is_stable_clean wherever possible Signed-off-by: Xuehan Xu --- src/crimson/os/seastore/cache.cc | 2 +- src/crimson/os/seastore/cache.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc index d1e2e881627..4d1dc929607 100644 --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@ -780,7 +780,7 @@ void Cache::commit_replace_extent( extents.replace(*next, *prev); if (prev->get_type() == extent_types_t::ROOT) { - assert(prev->is_clean() + assert(prev->is_stable_clean() || prev->primary_ref_list_hook.is_linked()); if (prev->is_dirty()) { stats.dirty_bytes -= prev->get_length(); diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index c8234ff4280..c79473f98ba 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -1364,7 +1364,7 @@ private: } void add_to_lru(CachedExtent &extent) { - assert(extent.is_clean() && !extent.is_placeholder()); + assert(extent.is_stable_clean() && !extent.is_placeholder()); if (!extent.primary_ref_list_hook.is_linked()) { contents += extent.get_length(); @@ -1390,7 +1390,7 @@ private: } void remove_from_lru(CachedExtent &extent) { - assert(extent.is_clean() && !extent.is_placeholder()); + assert(extent.is_stable_clean() && !extent.is_placeholder()); if (extent.primary_ref_list_hook.is_linked()) { lru.erase(lru.s_iterator_to(extent)); @@ -1401,7 +1401,7 @@ private: } void move_to_top(CachedExtent &extent) { - assert(extent.is_clean() && !extent.is_placeholder()); + assert(extent.is_stable_clean() && !extent.is_placeholder()); if (extent.primary_ref_list_hook.is_linked()) { lru.erase(lru.s_iterator_to(extent)); -- 2.39.5