diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-10-21 14:33:31 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-10-21 14:33:31 -0400 |
| commit | 6a84a5a9bb42cad077e9b65dda9d20c4f50a4acd (patch) | |
| tree | 17a437bb90947e25caa64103e8435a4c512be0de | |
| parent | 6d1f979bc5cd406925330864d50866b523fc4845 (diff) | |
bcachefs: Fix error handling in bch2_trans_extent_merging
The back merging case wasn't returning errors correctly.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 762a97739d80..004f0ac2126f 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -1160,13 +1160,13 @@ next: if (bch2_bkey_maybe_mergable(&insert->k, k.k)) { ret = check_pos_snapshot_overwritten(trans, btree_id, insert->k.p); if (ret < 0) - goto out; + goto err; if (ret) goto nomerge2; ret = check_pos_snapshot_overwritten(trans, btree_id, k.k->p); if (ret < 0) - goto out; + goto err; if (ret) goto nomerge2; |