diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-27 16:43:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-27 16:43:11 -0400 |
| commit | 8eaf8ddf45fbcd9900b561f2804f145f06417db5 (patch) | |
| tree | f2343c589fbe7d0645fd1b81ff2af22bb411ca9e /libbcachefs/lru.c | |
| parent | 9799b119c34d7be1ee96d143209cfe5fc543d92a (diff) | |
Update bcachefs sources to 7250b2ee5574 bcachefs: Fix deleted inodes btree in snapshot deletion
Diffstat (limited to 'libbcachefs/lru.c')
| -rw-r--r-- | libbcachefs/lru.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libbcachefs/lru.c b/libbcachefs/lru.c index 215a6533..a5cc0ed1 100644 --- 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, @@ -95,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); @@ -125,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], |