Update bcachefs sources to 2115a2ffde bcachefs: Kill bch2_verify_bucket_evacuated()

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

diff --git a/libbcachefs/data_update.c b/libbcachefs/data_update.c
index 6b0a5fbe377ca59607fcdac49dd4c4984332fac0..0e29ff56966ab5a61dc84be67078fa199dc33117 100644 (file)
--- a/libbcachefs/data_update.c
+++ b/libbcachefs/data_update.c
@@ -93,6 +93,17 @@ static int insert_snapshot_whiteouts(struct btree_trans *trans,
        return ret;
 }
 
+static void trace_move_extent_finish2(struct bch_fs *c, struct bkey_s_c k)
+{
+       if (trace_move_extent_finish_enabled()) {
+               struct printbuf buf = PRINTBUF;
+
+               bch2_bkey_val_to_text(&buf, c, k);
+               trace_move_extent_finish(c, buf.buf);
+               printbuf_exit(&buf);
+       }
+}
+
 static void trace_move_extent_fail2(struct data_update *m,
                         struct bkey_s_c new,
                         struct bkey_s_c wrote,
@@ -343,7 +354,7 @@ restart_drop_extra_replicas:
                        bch2_btree_iter_set_pos(&iter, next_pos);
 
                        this_cpu_add(c->counters[BCH_COUNTER_move_extent_finish], new->k.size);
-                       trace_move_extent_finish(&new->k);
+                       trace_move_extent_finish2(c, bkey_i_to_s_c(&new->k_i));
                }
 err:
                if (bch2_err_matches(ret, BCH_ERR_transaction_restart))