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>

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 2e7b9210564d5d11ab7532774294382a647e4885..fbe6a17ffd8a99c8df7665da29697f0a4f020614 100644 (file)
--- 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 a167e30e14121f1689536c6dbaeb47088ff58129..afee0594efae1adfe6ae45f8c10b61c9c5352c77 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -1270,14 +1270,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");
@@ -1309,6 +1310,7 @@ void fs_usage_apply_warn(struct btree_trans *trans,
                        }
                }
        }
+       __WARN();
 }
 
 void bch2_trans_fs_usage_apply(struct btree_trans *trans,
@@ -1367,7 +1369,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: */