From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Fri, 15 Mar 2019 23:34:16 +0000 (-0400)
Subject: bcachefs: fix bch2_mark_bkey_replicas() call
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=db8a5f0a6abd1981caf4b87cc65e5a998851f9c6;p=linux.git

bcachefs: fix bch2_mark_bkey_replicas() call

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 7749fccd0eab8..b484cbc3071e2 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -797,8 +797,13 @@ err:
 		}
 
 		bch2_btree_iter_unlock(trans->entries[0].iter);
-		ret = bch2_mark_bkey_replicas(c, bkey_i_to_s_c(i->k))
-			?: -EINTR;
+		ret = -EINTR;
+
+		trans_for_each_iter(trans, i) {
+			int ret2 = bch2_mark_bkey_replicas(c, bkey_i_to_s_c(i->k));
+			if (ret2)
+				ret = ret2;
+		}
 		break;
 	default:
 		BUG_ON(ret >= 0);