From 7142075fdac05c8ed3adc51cf39d985171ca9105 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 12 May 2023 18:00:32 -0400 Subject: [PATCH] Update bcachefs sources to ed4d21711d bcachefs: Replace a BUG_ON() with fatal error Signed-off-by: Kent Overstreet --- .bcachefs_revision | 2 +- include/linux/six.h | 2 +- libbcachefs/journal_io.c | 7 ++++++- libbcachefs/quota.c | 4 ++++ libbcachefs/replicas.c | 25 ------------------------- libbcachefs/subvolume.c | 20 ++++++++++---------- 6 files changed, 22 insertions(+), 38 deletions(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index 084fc8af..a9cf3c15 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -5074caad6a72d6e38c21a7e02f5e62048f2046d7 +ed4d21711ddc996ee77be1258ee11c6d28c23784 diff --git a/include/linux/six.h b/include/linux/six.h index 16ad2073..83023f64 100644 --- a/include/linux/six.h +++ b/include/linux/six.h @@ -49,7 +49,7 @@ * six_trylock_type(lock, type) * six_trylock_convert(lock, from, to) * - * A lock may be held multiple types by the same thread (for read or intent, + * A lock may be held multiple times by the same thread (for read or intent, * not write). However, the six locks code does _not_ implement the actual * recursive checks itself though - rather, if your code (e.g. btree iterator * code) knows that the current thread already has a lock held, and for the diff --git a/libbcachefs/journal_io.c b/libbcachefs/journal_io.c index ede9d198..a04b2aee 100644 --- a/libbcachefs/journal_io.c +++ b/libbcachefs/journal_io.c @@ -1743,7 +1743,12 @@ void bch2_journal_write(struct closure *cl) BUG_ON(u64s > j->entry_u64s_reserved); le32_add_cpu(&jset->u64s, u64s); - BUG_ON(vstruct_sectors(jset, c->block_bits) > w->sectors); + + if (vstruct_sectors(jset, c->block_bits) > w->sectors) { + bch2_fs_fatal_error(c, "aieeee! journal write does not fit in allocated space!, %zu > %u", + vstruct_bytes(jset), w->sectors << 9); + goto err; + } jset->magic = cpu_to_le64(jset_magic(c)); jset->version = c->sb.version < bcachefs_metadata_version_bkey_renumber diff --git a/libbcachefs/quota.c b/libbcachefs/quota.c index cc0db72c..310eb9d2 100644 --- a/libbcachefs/quota.c +++ b/libbcachefs/quota.c @@ -2,6 +2,7 @@ #include "bcachefs.h" #include "btree_update.h" #include "errcode.h" +#include "error.h" #include "inode.h" #include "quota.h" #include "subvolume.h" @@ -561,6 +562,9 @@ static int bch2_fs_quota_read_inode(struct btree_trans *trans, ret = bch2_snapshot_tree_lookup(trans, snapshot_t(c, k.k->p.snapshot)->tree, &s_t); + bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c, + "%s: snapshot tree %u not found", __func__, + snapshot_t(c, k.k->p.snapshot)->tree); if (ret) return ret; diff --git a/libbcachefs/replicas.c b/libbcachefs/replicas.c index 8ae50dfd..76efbfce 100644 --- a/libbcachefs/replicas.c +++ b/libbcachefs/replicas.c @@ -460,36 +460,11 @@ int bch2_replicas_delta_list_mark(struct bch_fs *c, int bch2_replicas_gc_end(struct bch_fs *c, int ret) { - unsigned i; - lockdep_assert_held(&c->replicas_gc_lock); mutex_lock(&c->sb_lock); percpu_down_write(&c->mark_lock); - /* - * this is kind of crappy; the replicas gc mechanism needs to be ripped - * out - */ - - for (i = 0; i < c->replicas.nr; i++) { - struct bch_replicas_entry *e = - cpu_replicas_entry(&c->replicas, i); - struct bch_replicas_cpu n; - - if (!__replicas_has_entry(&c->replicas_gc, e) && - bch2_fs_usage_read_one(c, &c->usage_base->replicas[i])) { - n = cpu_replicas_add_entry(&c->replicas_gc, e); - if (!n.entries) { - ret = -BCH_ERR_ENOMEM_cpu_replicas; - goto err; - } - - swap(n, c->replicas_gc); - kfree(n.entries); - } - } - ret = bch2_cpu_replicas_to_sb_replicas(c, &c->replicas_gc); if (ret) goto err; diff --git a/libbcachefs/subvolume.c b/libbcachefs/subvolume.c index 5b145d85..388fa12b 100644 --- a/libbcachefs/subvolume.c +++ b/libbcachefs/subvolume.c @@ -37,14 +37,8 @@ int bch2_snapshot_tree_invalid(const struct bch_fs *c, struct bkey_s_c k, int bch2_snapshot_tree_lookup(struct btree_trans *trans, u32 id, struct bch_snapshot_tree *s) { - int ret; - - ret = bch2_bkey_get_val_typed(trans, BTREE_ID_snapshot_trees, POS(0, id), - BTREE_ITER_WITH_UPDATES, snapshot_tree, s); - - if (bch2_err_matches(ret, ENOENT)) - bch_err(trans->c, "snapshot tree %u not found", id); - return ret; + return bch2_bkey_get_val_typed(trans, BTREE_ID_snapshot_trees, POS(0, id), + BTREE_ITER_WITH_UPDATES, snapshot_tree, s); } static struct bkey_i_snapshot_tree * @@ -434,6 +428,8 @@ static int snapshot_tree_ptr_good(struct btree_trans *trans, struct bch_snapshot_tree s_t; int ret = bch2_snapshot_tree_lookup(trans, tree_id, &s_t); + if (bch2_err_matches(ret, ENOENT)) + return 0; if (ret) return ret; @@ -467,10 +463,10 @@ static int snapshot_tree_ptr_repair(struct btree_trans *trans, tree_id = le32_to_cpu(root.v->tree); ret = bch2_snapshot_tree_lookup(trans, tree_id, &s_t); - if (ret) + if (ret && !bch2_err_matches(ret, ENOENT)) return ret; - if (le32_to_cpu(s_t.root_snapshot) != root_id) { + if (ret || le32_to_cpu(s_t.root_snapshot) != root_id) { u = bch2_bkey_make_mut_typed(trans, &root_iter, root.s_c, 0, snapshot); ret = PTR_ERR_OR_ZERO(u) ?: snapshot_tree_create(trans, root_id, @@ -664,6 +660,10 @@ static int check_subvol(struct btree_trans *trans, struct bch_snapshot_tree st; ret = bch2_snapshot_tree_lookup(trans, snapshot_tree, &st); + + bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c, + "%s: snapshot tree %u not found", __func__, snapshot_tree); + if (ret) return ret;