From ded9bb01d11bc02e39e9aa49764f21b0eb4522ff Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Thu, 31 Mar 2022 10:22:05 +0800 Subject: [PATCH] crimson/os/seastore/cache: clean up in Cache::get_next_dirty_extents() Signed-off-by: Xuehan Xu --- src/crimson/os/seastore/cache.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc index 8c8a0f8b5c01b..d29c2549a5e9f 100644 --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@ -1389,13 +1389,12 @@ Cache::get_next_dirty_extents_ret Cache::get_next_dirty_extents( i != dirty.end() && bytes_so_far < max_bytes; ++i) { auto dirty_from = i->get_dirty_from(); - if (!(dirty_from != JOURNAL_SEQ_NULL && + if (unlikely(!(dirty_from != JOURNAL_SEQ_NULL && dirty_from != JOURNAL_SEQ_MAX && - dirty_from != NO_DELTAS)) - ERRORT("{}", *i); - ceph_assert(dirty_from != JOURNAL_SEQ_NULL && - dirty_from != JOURNAL_SEQ_MAX && - dirty_from != NO_DELTAS); + dirty_from != NO_DELTAS))) { + ERRORT("{}", t, *i); + ceph_abort(); + } if (dirty_from < seq) { TRACET("next extent -- {}", t, *i); if (!cand.empty() && cand.back()->get_dirty_from() > dirty_from) { -- 2.39.5