Update bcachefs sources to 1a739db0b256 bcachefs; guard against overflow in btree...

[bcachefs-tools-debian] / libbcachefs / btree_iter.c

diff --git a/libbcachefs/btree_iter.c b/libbcachefs/btree_iter.c
index 2bd712ebb28854b3d8b4d32ad9163fb51ec5a2dd..bfd7cb59fbd7e74e0dd060a08a76dbfd85394db7 100644 (file)
--- a/libbcachefs/btree_iter.c
+++ b/libbcachefs/btree_iter.c
@@ -652,7 +652,6 @@ void bch2_btree_path_level_init(struct btree_trans *trans,
 static void bch2_trans_revalidate_updates_in_node(struct btree_trans *trans, struct btree *b)
 {
        struct bch_fs *c = trans->c;
-       struct btree_insert_entry *i;
 
        trans_for_each_update(trans, i)
                if (!i->cached &&
@@ -1374,8 +1373,6 @@ void __noreturn bch2_trans_in_restart_error(struct btree_trans *trans)
 noinline __cold
 void bch2_trans_updates_to_text(struct printbuf *buf, struct btree_trans *trans)
 {
-       struct btree_insert_entry *i;
-
        prt_printf(buf, "transaction updates for %s journal seq %llu",
               trans->fn, trans->journal_res.seq);
        prt_newline(buf);
@@ -1881,7 +1878,6 @@ static noinline
 struct bkey_i *__bch2_btree_trans_peek_updates(struct btree_iter *iter)
 {
        struct btree_trans *trans = iter->trans;
-       struct btree_insert_entry *i;
        struct bkey_i *ret = NULL;
 
        trans_for_each_update(trans, i) {
@@ -2322,7 +2318,7 @@ struct bkey_s_c bch2_btree_iter_peek_prev(struct btree_iter *iter)
                                        goto got_key;
                                }
 
-                               if (bch2_snapshot_is_ancestor(iter->trans->c,
+                               if (bch2_snapshot_is_ancestor(trans->c,
                                                              iter->snapshot,
                                                              k.k->p.snapshot)) {
                                        if (saved_path)
@@ -3015,7 +3011,6 @@ leaked:
 void bch2_trans_put(struct btree_trans *trans)
        __releases(&c->btree_trans_barrier)
 {
-       struct btree_insert_entry *i;
        struct bch_fs *c = trans->c;
 
        bch2_trans_unlock(trans);