Update bcachefs sources to 50847e296b34 bcachefs: Check subvol <-> inode pointers...

[bcachefs-tools-debian] / libbcachefs / lru.c

diff --git a/libbcachefs/lru.c b/libbcachefs/lru.c
index 2387e08440d3f166534bdf1b396a0547dabe049f..7a4ca5a28b3eac83ead3d5e585e8886db5c456c9 100644 (file)
--- a/libbcachefs/lru.c
+++ b/libbcachefs/lru.c
@@ -10,17 +10,17 @@
 #include "recovery.h"
 
 /* KEY_TYPE_lru is obsolete: */
-int bch2_lru_invalid(const struct bch_fs *c, struct bkey_s_c k,
+int bch2_lru_invalid(struct bch_fs *c, struct bkey_s_c k,
                     enum bkey_invalid_flags flags,
                     struct printbuf *err)
 {
-       if (!lru_pos_time(k.k->p)) {
-               prt_printf(err, "lru entry at time=0");
-               return -BCH_ERR_invalid_bkey;
-
-       }
+       int ret = 0;
 
-       return 0;
+       bkey_fsck_err_on(!lru_pos_time(k.k->p), c, err,
+                        lru_entry_at_time_0,
+                        "lru entry at time=0");
+fsck_err:
+       return ret;
 }
 
 void bch2_lru_to_text(struct printbuf *out, struct bch_fs *c,
@@ -41,29 +41,12 @@ void bch2_lru_pos_to_text(struct printbuf *out, struct bpos lru)
 }
 
 static int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
-                       u64 dev_bucket, u64 time, unsigned key_type)
+                         u64 dev_bucket, u64 time, bool set)
 {
-       struct bkey_i *k;
-       int ret = 0;
-
-       if (!time)
-               return 0;
-
-       k = bch2_trans_kmalloc_nomemzero(trans, sizeof(*k));
-       ret = PTR_ERR_OR_ZERO(k);
-       if (unlikely(ret))
-               return ret;
-
-       bkey_init(&k->k);
-       k->k.type = key_type;
-       k->k.p = lru_pos(lru_id, dev_bucket, time);
-
-       EBUG_ON(lru_pos_id(k->k.p) != lru_id);
-       EBUG_ON(lru_pos_time(k->k.p) != time);
-       EBUG_ON(k->k.p.offset != dev_bucket);
-
-       return bch2_trans_update_buffered(trans, BTREE_ID_lru, k,
-                                         key_type == KEY_TYPE_deleted);
+       return time
+               ? bch2_btree_bit_mod(trans, BTREE_ID_lru,
+                                    lru_pos(lru_id, dev_bucket, time), set)
+               : 0;
 }
 
 int bch2_lru_del(struct btree_trans *trans, u16 lru_id, u64 dev_bucket, u64 time)
@@ -112,6 +95,7 @@ static int bch2_check_lru_key(struct btree_trans *trans,
        int ret;
 
        if (fsck_err_on(!bch2_dev_bucket_exists(c, alloc_pos), c,
+                       lru_entry_to_invalid_bucket,
                        "lru key points to nonexistent device:bucket %llu:%llu",
                        alloc_pos.inode, alloc_pos.offset))
                return bch2_btree_delete_at(trans, lru_iter, 0);
@@ -142,7 +126,8 @@ static int bch2_check_lru_key(struct btree_trans *trans,
                }
 
                if (c->opts.reconstruct_alloc ||
-                   fsck_err(c, "incorrect lru entry: lru %s time %llu\n"
+                   fsck_err(c, lru_entry_bad,
+                            "incorrect lru entry: lru %s time %llu\n"
                             "  %s\n"
                             "  for %s",
                             bch2_lru_types[type],
@@ -162,18 +147,13 @@ fsck_err:
 
 int bch2_check_lrus(struct bch_fs *c)
 {
-       struct btree_iter iter;
-       struct bkey_s_c k;
        struct bpos last_flushed_pos = POS_MIN;
-       int ret = 0;
-
-       ret = bch2_trans_run(c,
-               for_each_btree_key_commit(&trans, iter,
+       int ret = bch2_trans_run(c,
+               for_each_btree_key_commit(trans, iter,
                                BTREE_ID_lru, POS_MIN, BTREE_ITER_PREFETCH, k,
-                               NULL, NULL, BTREE_INSERT_NOFAIL|BTREE_INSERT_LAZY_RW,
-                       bch2_check_lru_key(&trans, &iter, k, &last_flushed_pos)));
-       if (ret)
-               bch_err_fn(c, ret);
+                               NULL, NULL, BCH_TRANS_COMMIT_no_enospc|BCH_TRANS_COMMIT_lazy_rw,
+                       bch2_check_lru_key(trans, &iter, k, &last_flushed_pos)));
+       bch_err_fn(c, ret);
        return ret;
 
 }