diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-02-18 20:02:41 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-02-18 20:02:57 -0500 |
| commit | 4bd0a715f5e0a7d516c8319ea1b8c55f13aeb83c (patch) | |
| tree | e5b7635bc89b19e620bce9c279a30dea60d7b0e6 | |
| parent | 9203815dc2c24927c93c1828fb6638d125c2a06b (diff) | |
bcachefs: Check for bad key version number
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_gc.c | 6 | ||||
| -rw-r--r-- | fs/bcachefs/io.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c index 05879b66d6af..3705c41f5151 100644 --- a/fs/bcachefs/btree_gc.c +++ b/fs/bcachefs/btree_gc.c @@ -124,7 +124,11 @@ static int bch2_gc_mark_key(struct bch_fs *c, struct bkey_s_c k, BUG_ON(journal_seq_verify(c) && k.k->version.lo > journal_cur_seq(&c->journal)); - if (k.k->version.lo > atomic64_read(&c->key_version)) + /* XXX change to fsck check */ + if (fsck_err_on(k.k->version.lo > atomic64_read(&c->key_version), c, + "key version number higher than recorded: %llu > %llu", + k.k->version.lo, + atomic64_read(&c->key_version))) atomic64_set(&c->key_version, k.k->version.lo); if (test_bit(BCH_FS_REBUILD_REPLICAS, &c->flags) || diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index ca83d79e06fe..0d3366c25ba6 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -942,7 +942,7 @@ static int bch2_write_extent(struct bch_write_op *op, struct write_point *wp, if (bch2_csum_type_is_encryption(op->csum_type)) { if (bversion_zero(version)) { - version.lo = atomic64_inc_return(&c->key_version) + 1; + version.lo = atomic64_inc_return(&c->key_version); } else { crc.nonce = op->nonce; op->nonce += src_len >> 9; |