diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-17 00:28:50 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-19 15:33:48 -0400 |
| commit | 38289faac12d2ddbc1da6b7d297ccf16e73400df (patch) | |
| tree | a0552b070e11406011ba2fa05690b97061c7a647 | |
| parent | e257dc21f44d8aa432132a4d7009abf55f37d22a (diff) | |
bcachefs: Fix bch2_extent_can_insert() call
It was being skipped when hole punching, leading to problems when
splitting compressed extents.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 6 | ||||
| -rw-r--r-- | fs/bcachefs/buckets.c | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 64b6e86cf90a..ac6a039b3fa4 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -806,13 +806,13 @@ static int extent_update_to_keys(struct btree_trans *trans, { int ret; - if (bkey_deleted(&n.k->k)) - return 0; - ret = bch2_extent_can_insert(trans, n.iter, n.k); if (ret) return ret; + if (bkey_deleted(&n.k->k)) + return 0; + n.iter = bch2_trans_get_iter(trans, n.iter->btree_id, n.k->k.p, BTREE_ITER_INTENT| BTREE_ITER_NOT_EXTENTS); diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 6e988a28a6be..151b9db32798 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -1266,14 +1266,15 @@ int bch2_mark_update(struct btree_trans *trans, static noinline __cold void fs_usage_apply_warn(struct btree_trans *trans, - unsigned disk_res_sectors) + unsigned disk_res_sectors, + s64 should_not_have_added) { struct bch_fs *c = trans->c; struct btree_insert_entry *i; char buf[200]; - bch_err(c, "disk usage increased more than %u sectors reserved", - disk_res_sectors); + bch_err(c, "disk usage increased %lli more than %u sectors reserved", + should_not_have_added, disk_res_sectors); trans_for_each_update(trans, i) { pr_err("while inserting"); @@ -1305,6 +1306,7 @@ void fs_usage_apply_warn(struct btree_trans *trans, } } } + __WARN(); } void bch2_trans_fs_usage_apply(struct btree_trans *trans, @@ -1363,7 +1365,7 @@ void bch2_trans_fs_usage_apply(struct btree_trans *trans, preempt_enable(); if (unlikely(warn) && !xchg(&warned_disk_usage, 1)) - fs_usage_apply_warn(trans, disk_res_sectors); + fs_usage_apply_warn(trans, disk_res_sectors, should_not_have_added); } /* trans_mark: */ |