Update bcachefs sources to 400f275d46 bcachefs: Fix check_overlapping_extents()

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

diff --git a/libbcachefs/data_update.c b/libbcachefs/data_update.c
index 0e29ff56966ab5a61dc84be67078fa199dc33117..c709538ce9c2e432e6606eecd52d541067d763c0 100644 (file)
--- a/libbcachefs/data_update.c
+++ b/libbcachefs/data_update.c
@@ -14,8 +14,7 @@
 #include "move.h"
 #include "nocow_locking.h"
 #include "subvolume.h"
-
-#include <trace/events/bcachefs.h>
+#include "trace.h"
 
 static int insert_snapshot_whiteouts(struct btree_trans *trans,
                                     enum btree_id id,
@@ -58,10 +57,9 @@ static int insert_snapshot_whiteouts(struct btree_trans *trans,
 
                        whiteout_pos.snapshot = k.k->p.snapshot;
 
-                       bch2_trans_iter_init(trans, &iter2, id, whiteout_pos,
-                                            BTREE_ITER_NOT_EXTENTS|
-                                            BTREE_ITER_INTENT);
-                       k2 = bch2_btree_iter_peek_slot(&iter2);
+                       k2 = bch2_bkey_get_iter(trans, &iter2, id, whiteout_pos,
+                                               BTREE_ITER_NOT_EXTENTS|
+                                               BTREE_ITER_INTENT);
                        ret = bkey_err(k2);
 
                        if (!ret && k2.k->type == KEY_TYPE_deleted) {