bcachefs: Fix for_each_btree_key2()

Previously, when we exited from the loop body with a break statement
_ret wouldn't have been assigned to yet, and we could spuriously return
a transaction restart error.

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

diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index 635cf97f56929bdf0264932bf726d45f619db5f0..1c60122c5ea5c1e8a8bca21228db6b1d72d0d3d2 100644 (file)
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -490,11 +490,11 @@ __bch2_btree_iter_peek_and_restart(struct btree_trans *trans,
                                                                        \
        while (1) {                                                     \
                u32 _restart_count = bch2_trans_begin(_trans);          \
+                                                                       \
+               _ret = 0;                                               \
                (_k) = bch2_btree_iter_peek_type(&(_iter), (_flags));   \
-               if (!(_k).k) {                                          \
-                       _ret = 0;                                       \
+               if (!(_k).k)                                            \
                        break;                                          \
-               }                                                       \
                                                                        \
                _ret = bkey_err(_k) ?: (_do);                           \
                if (bch2_err_matches(_ret, BCH_ERR_transaction_restart))\