diff options
| author |   Kent Overstreet <kent.overstreet@linux.dev> | 2023-09-26 17:11:23 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:15 -0400 |
| commit | d281701b00fc857755cd0fc08a415a694d5f49c0 (patch) | |
| tree | b6b13a7247da223a2552431c16d7eb6a3491d356 | |
| parent | bcachefs: bch_err_msg(), bch_err_fn() now filters out transaction restart errors (diff) | |
| download | wireguard-linux-d281701b00fc857755cd0fc08a415a694d5f49c0.tar.xz wireguard-linux-d281701b00fc857755cd0fc08a415a694d5f49c0.zip | |
bcachefs: Fix looping around bch2_propagate_key_to_snapshot_leaves()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to '')
| -rw-r--r-- | fs/bcachefs/snapshot.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c index cdf9eda2ee02..3ecc17b8d6fc 100644 --- a/fs/bcachefs/snapshot.c +++ b/fs/bcachefs/snapshot.c @@ -1636,9 +1636,15 @@ int bch2_propagate_key_to_snapshot_leaves(struct btree_trans *trans, if (!bch2_snapshot_is_ancestor(c, id, k.k->p.snapshot) || !bch2_snapshot_is_leaf(c, id)) continue; +again: + ret = btree_trans_too_many_iters(trans) ?: + bch2_propagate_key_to_snapshot_leaf(trans, btree, k, id, new_min_pos) ?: + bch2_trans_commit(trans, NULL, NULL, 0); + if (ret && bch2_err_matches(ret, BCH_ERR_transaction_restart)) { + bch2_trans_begin(trans); + goto again; + } - ret = commit_do(trans, NULL, NULL, 0, - bch2_propagate_key_to_snapshot_leaf(trans, btree, k, id, new_min_pos)); if (ret) break; } |