diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-26 16:20:08 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-26 19:27:18 -0400 |
| commit | b41d273b24f27ed95ac061660a97abbd4dea9c19 (patch) | |
| tree | 77ee723bcea1a0663a2450dd248de2b3dd2735c5 | |
| parent | 1187760d2f1215d32677a9957aa47b223d81c6dd (diff) | |
bcachefs: Fix snapshot skiplists
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/snapshot.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c index 315e88cc3867..e70adfcbd953 100644 --- a/fs/bcachefs/snapshot.c +++ b/fs/bcachefs/snapshot.c @@ -255,8 +255,7 @@ int bch2_snapshot_invalid(const struct bch_fs *c, struct bkey_s_c k, for (i = 0; i < ARRAY_SIZE(s.v->skip); i++) { id = le32_to_cpu(s.v->skip[i]); - if ((id && !s.v->parent) || - (id && id <= k.k->p.offset)) { + if (id && id < le32_to_cpu(s.v->parent)) { prt_printf(err, "bad skiplist node %u", id); return -BCH_ERR_invalid_bkey; } @@ -1348,12 +1347,12 @@ static int bch2_fix_child_of_deleted_snapshot(struct btree_trans *trans, u32 id = le32_to_cpu(s->v.skip[j]); if (snapshot_list_has_id(deleted, id)) { - id = depth > 1 - ? bch2_snapshot_nth_parent_skip(c, + id = bch2_snapshot_nth_parent_skip(c, parent, - get_random_u32_below(depth - 1), - deleted) - : parent; + depth > 1 + ? get_random_u32_below(depth - 1) + : 0, + deleted); s->v.skip[j] = cpu_to_le32(id); } } |