From 2d7982de784b24e24baa20eee0a97dea451b8fa7 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Tue, 1 Aug 2023 16:57:52 -0400 Subject: [PATCH] cmd_list_journal: Tweak extent matching Extents can now additionally be matched by the end position, the same as normal keys. Signed-off-by: Kent Overstreet --- cmd_list_journal.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd_list_journal.c b/cmd_list_journal.c index ce4caad4..655bfe2e 100644 --- a/cmd_list_journal.c +++ b/cmd_list_journal.c @@ -61,14 +61,13 @@ static bool bkey_matches_filter(d_bbpos filter, struct jset_entry *entry, struct if (i->btree != entry->btree_id) continue; - if (!btree_node_type_is_extents(i->btree)) { - if (bkey_eq(i->pos, k->k.p)) - return true; - } else { - if (bkey_ge(i->pos, bkey_start_pos(&k->k)) && - bkey_lt(i->pos, k->k.p)) - return true; - } + if (bkey_eq(i->pos, k->k.p)) + return true; + + if (btree_node_type_is_extents(i->btree) && + bkey_ge(i->pos, bkey_start_pos(&k->k)) && + bkey_lt(i->pos, k->k.p)) + return true; } return false; }