From: Dan Robertson Date: Thu, 17 Jun 2021 03:21:23 +0000 (-0400) Subject: bcachefs: ensure iter->should_be_locked is set X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=33a1f84b76b94a64cc8244b176567257170c6695;p=linux.git bcachefs: ensure iter->should_be_locked is set Ensure that iter->should_be_locked value is set to true before we call bch2_trans_update in ec_stripe_update_ptrs. Signed-off-by: Dan Robertson Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c index 7cc7ca94b0828..c0855245f2ec4 100644 --- a/fs/bcachefs/ec.c +++ b/fs/bcachefs/ec.c @@ -863,7 +863,8 @@ static int ec_stripe_update_ptrs(struct bch_fs *c, extent_stripe_ptr_add(e, s, ec_ptr, block); bch2_btree_iter_set_pos(iter, bkey_start_pos(&sk.k->k)); - ret = bch2_trans_update(&trans, iter, sk.k, 0) ?: + ret = bch2_btree_iter_traverse(iter) ?: + bch2_trans_update(&trans, iter, sk.k, 0) ?: bch2_trans_commit(&trans, NULL, NULL, BTREE_INSERT_NOFAIL); if (ret == -EINTR)