Update upstream source from tag 'v1.6.3'

[bcachefs-tools-debian] / libbcachefs / btree_update.h

diff --git a/libbcachefs/btree_update.h b/libbcachefs/btree_update.h
index ebad7384e579c0b79073149e0851d204b8843a72..cc7c53e83f89dd5cdc8ccccab214ae3cbfd3fb72 100644 (file)
--- a/libbcachefs/btree_update.h
+++ b/libbcachefs/btree_update.h
@@ -63,11 +63,12 @@ int bch2_btree_delete_range(struct bch_fs *, enum btree_id,
                            struct bpos, struct bpos, unsigned, u64 *);
 
 int bch2_btree_bit_mod(struct btree_trans *, enum btree_id, struct bpos, bool);
+int bch2_btree_bit_mod_buffered(struct btree_trans *, enum btree_id, struct bpos, bool);
 
 static inline int bch2_btree_delete_at_buffered(struct btree_trans *trans,
                                                enum btree_id btree, struct bpos pos)
 {
-       return bch2_btree_bit_mod(trans, btree, pos, false);
+       return bch2_btree_bit_mod_buffered(trans, btree, pos, false);
 }
 
 int __bch2_insert_snapshot_whiteouts(struct btree_trans *, enum btree_id,
@@ -187,14 +188,12 @@ static inline int bch2_trans_commit(struct btree_trans *trans,
        bch2_trans_run(_c, commit_do(trans, _disk_res, _journal_seq, _flags, _do))
 
 #define trans_for_each_update(_trans, _i)                              \
-       for ((_i) = (_trans)->updates;                                  \
+       for (struct btree_insert_entry *_i = (_trans)->updates;         \
             (_i) < (_trans)->updates + (_trans)->nr_updates;           \
             (_i)++)
 
 static inline void bch2_trans_reset_updates(struct btree_trans *trans)
 {
-       struct btree_insert_entry *i;
-
        trans_for_each_update(trans, i)
                bch2_path_put(trans, i->path, true);