bcachefs: Call bch2_btree_iter_traverse() if necessary in commit path

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

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index fc4d4b0d3770692665472df58767b4bcfa27198e..7b4b12442db87f9b7e5ddd16941da399b573655c 100644 (file)
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -830,9 +830,9 @@ int __bch2_trans_commit(struct btree_trans *trans)
                trans_trigger_run = false;
 
                trans_for_each_update(trans, i) {
-                       if (unlikely(i->iter->uptodate > BTREE_ITER_NEED_PEEK)) {
+                       if (unlikely(i->iter->uptodate > BTREE_ITER_NEED_PEEK &&
+                                    (ret = bch2_btree_iter_traverse(i->iter)))) {
                                trace_trans_restart_traverse(trans->ip);
-                               ret = -EINTR;
                                goto out;
                        }