diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-13 10:15:11 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-13 10:16:37 -0500 |
| commit | dc8aadbf5948ee936dd5e332961f153f6aea6f67 (patch) | |
| tree | 6ee0012347de795d4788ac635efadfc5e8d42b10 | |
| parent | 3ee023bb950638d332379ffd42b7feb4f0b69aa9 (diff) | |
bcachefs: Add another sequence number to struct btree_node
Give two different btree nodes for the same part of the keyspace, this
lets us tell which one is newer - now, we should have enough information
in the btree node header to reconstruct missing interior nodes
| -rw-r--r-- | fs/bcachefs/bcachefs_format.h | 6 | ||||
| -rw-r--r-- | fs/bcachefs/btree_io.c | 5 | ||||
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index 85f728f21295..eedfffcaf689 100644 --- a/fs/bcachefs/bcachefs_format.h +++ b/fs/bcachefs/bcachefs_format.h @@ -1321,8 +1321,10 @@ struct btree_node { }; } __attribute__((packed, aligned(8))); -LE64_BITMASK(BTREE_NODE_ID, struct btree_node, flags, 0, 4); -LE64_BITMASK(BTREE_NODE_LEVEL, struct btree_node, flags, 4, 8); +LE64_BITMASK(BTREE_NODE_ID, struct btree_node, flags, 0, 4); +LE64_BITMASK(BTREE_NODE_LEVEL, struct btree_node, flags, 4, 8); +/* 8-32 unused */ +LE64_BITMASK(BTREE_NODE_SEQ, struct btree_node, flags, 32, 64); struct btree_node_entry { struct bch_csum csum; diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c index 9b4eff1c83d1..d805fb41886b 100644 --- a/fs/bcachefs/btree_io.c +++ b/fs/bcachefs/btree_io.c @@ -1135,6 +1135,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry unsigned sectors, whiteout_u64s = 0; struct nonce nonce; struct bch_csum csum; + bool first = !b->written; if (!b->written) { i = &b->data->keys; @@ -1194,10 +1195,10 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry } if (ret) { - btree_err_on(!b->written, + btree_err_on(first, BTREE_ERR_FIXABLE, c, b, i, "first btree node bset has blacklisted journal seq"); - if (b->written) + if (!first) continue; } diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 6d563bba4af2..0e0156d9016c 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -430,6 +430,7 @@ struct btree *__bch2_btree_node_alloc_replacement(struct btree_update *as, n->data->min_key = b->data->min_key; n->data->max_key = b->data->max_key; n->data->format = format; + SET_BTREE_NODE_SEQ(n->data, BTREE_NODE_SEQ(b->data) + 1); btree_node_set_format(n, format); @@ -1225,6 +1226,7 @@ static struct btree *__btree_split_node(struct btree_update *as, n2->data->max_key = n1->data->max_key; n2->data->format = n1->format; + SET_BTREE_NODE_SEQ(n2->data, BTREE_NODE_SEQ(n1->data)); n2->key.k.p = n1->key.k.p; btree_node_set_format(n2, n2->data->format); |