From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Mon, 8 Jun 2020 18:28:16 +0000 (-0400)
Subject: bcachefs: Call bch2_btree_iter_traverse() if necessary in commit path
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8804ef1f28def994562801f68d271ad4f0cf1c36;p=linux.git

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 fc4d4b0d37706..7b4b12442db87 100644
--- 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;
 			}