]> git.sesse.net Git - bcachefs-tools-debian/commitdiff
cmd_list_journal: Tweak extent matching
authorKent Overstreet <kent.overstreet@linux.dev>
Tue, 1 Aug 2023 20:57:52 +0000 (16:57 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Tue, 1 Aug 2023 20:57:52 +0000 (16:57 -0400)
Extents can now additionally be matched by the end position, the same as
normal keys.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
cmd_list_journal.c

index ce4caad4c84b021ec14358250ed4781c9b73fd05..655bfe2e686e430416850c0d1fe9a54182371923 100644 (file)
@@ -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 (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;
 }
        }
        return false;
 }