diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-08-05 15:28:29 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-08-08 15:25:37 -0400 |
| commit | 704de99ee713353f4794cd85b39f16d6a1c88762 (patch) | |
| tree | 224eb9a9cfefaa8ca191c6d3eb14149382ce40d8 | |
| parent | a9ae6211c3926e0c25a3bacb3a7d33378b5f4236 (diff) | |
bcachefs: extent_squash() can no longer fail
| -rw-r--r-- | fs/bcachefs/extents.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c index 956f9ac6c579..ea40d383ccbb 100644 --- a/fs/bcachefs/extents.c +++ b/fs/bcachefs/extents.c @@ -1395,7 +1395,7 @@ bch2_extent_can_insert(struct btree_insert *trans, return BTREE_INSERT_OK; } -static enum btree_insert_ret +static void extent_squash(struct extent_insert_state *s, struct bkey_i *insert, struct bset_tree *t, struct bkey_packed *_k, struct bkey_s k, enum bch_extent_overlap overlap) @@ -1489,8 +1489,6 @@ extent_squash(struct extent_insert_state *s, struct bkey_i *insert, break; } } - - return BTREE_INSERT_OK; } static enum btree_insert_ret @@ -1535,7 +1533,7 @@ __bch2_insert_fixup_extent(struct extent_insert_state *s) _k->needs_whiteout = false; } - ret = extent_squash(s, insert, t, _k, k, overlap); + extent_squash(s, insert, t, _k, k, overlap); } else { if (bkey_whiteout(k.k)) goto next; @@ -1568,21 +1566,18 @@ __bch2_insert_fixup_extent(struct extent_insert_state *s) discard.k.needs_whiteout = true; - ret = extent_squash(s, insert, t, _k, k, overlap); - BUG_ON(ret != BTREE_INSERT_OK); + extent_squash(s, insert, t, _k, k, overlap); extent_bset_insert(c, iter, &discard); } else { - ret = extent_squash(s, insert, t, _k, k, overlap); - BUG_ON(ret != BTREE_INSERT_OK); + extent_squash(s, insert, t, _k, k, overlap); } next: bch2_cut_front(s->committed, insert); bch2_btree_iter_set_pos_same_leaf(iter, s->committed); } - if (ret != BTREE_INSERT_OK || - overlap == BCH_EXTENT_OVERLAP_FRONT || + if (overlap == BCH_EXTENT_OVERLAP_FRONT || overlap == BCH_EXTENT_OVERLAP_MIDDLE) break; } |