From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Fri, 3 Jan 2020 23:04:19 +0000 (-0500)
Subject: bcachefs: Fix an iterator error path
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d5cdf033cd371eb55f7337ac08bb4ac48135ce8b;p=linux.git

bcachefs: Fix an iterator error path

On transaction restart (-EINTR), we need to traverse all iterators.

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

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index d1218d34232dc..f37109150e421 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1027,10 +1027,7 @@ retry_all:
 	for (i = 0; i < nr_sorted; i++) {
 		iter = &trans->iters[sorted[i]];
 
-		do {
-			ret = btree_iter_traverse_one(iter);
-		} while (ret == -EINTR);
-
+		ret = btree_iter_traverse_one(iter);
 		if (ret)
 			goto retry_all;
 	}