bcachefs: Don't use peek_filter() unnecessarily

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index cd54c2b1eff22daf9b1ffe8d3564a28e08b9eaf4..22e30ed716c4c4cf742c767977bd144052b00679 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -1335,8 +1335,7 @@ int bch2_mark_update(struct btree_trans *trans,
            !bkey_deleted(&insert->k))
                return 0;
 
-       while ((_k = bch2_btree_node_iter_peek_filter(&node_iter, b,
-                                                     KEY_TYPE_discard))) {
+       while ((_k = bch2_btree_node_iter_peek(&node_iter, b))) {
                struct bkey             unpacked;
                struct bkey_s_c         k = bkey_disassemble(b, _k, &unpacked);
 
@@ -1382,8 +1381,7 @@ void bch2_trans_fs_usage_apply(struct btree_trans *trans,
                pr_err("overlapping with");
 
                node_iter = iter->l[0].iter;
-               while ((_k = bch2_btree_node_iter_peek_filter(&node_iter, b,
-                                                       KEY_TYPE_discard))) {
+               while ((_k = bch2_btree_node_iter_peek(&node_iter, b))) {
                        struct bkey             unpacked;
                        struct bkey_s_c         k;
 
@@ -1795,8 +1793,7 @@ int bch2_trans_mark_update(struct btree_trans *trans,
        if (unlikely(flags & BTREE_TRIGGER_NOOVERWRITES))
                return 0;
 
-       while ((_k = bch2_btree_node_iter_peek_filter(&node_iter, b,
-                                                     KEY_TYPE_discard))) {
+       while ((_k = bch2_btree_node_iter_peek(&node_iter, b))) {
                struct bkey             unpacked;
                struct bkey_s_c         k;
                unsigned                offset = 0;

diff --git a/fs/bcachefs/extent_update.c b/fs/bcachefs/extent_update.c
index fa6c0698f38526606eca2930669e84482dda019c..beb3b694e33c2cabb79feffc8a501711d15cf841 100644 (file)
--- a/fs/bcachefs/extent_update.c
+++ b/fs/bcachefs/extent_update.c
@@ -120,8 +120,7 @@ int bch2_extent_atomic_end(struct btree_iter *iter,
        if (ret < 0)
                return ret;
 
-       while ((_k = bch2_btree_node_iter_peek_filter(&node_iter, b,
-                                                     KEY_TYPE_discard))) {
+       while ((_k = bch2_btree_node_iter_peek(&node_iter, b))) {
                struct bkey     unpacked;
                struct bkey_s_c k = bkey_disassemble(b, _k, &unpacked);
                unsigned offset = 0;
@@ -182,8 +181,7 @@ bch2_extent_can_insert(struct btree_trans *trans,
        struct bkey unpacked;
        int sectors;
 
-       _k = bch2_btree_node_iter_peek_filter(&node_iter, l->b,
-                                             KEY_TYPE_discard);
+       _k = bch2_btree_node_iter_peek(&node_iter, l->b);
        if (!_k)
                return BTREE_INSERT_OK;