]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bcachefs: Change "disk accounting version 0" check to commit only
authorKent Overstreet <kent.overstreet@linux.dev>
Mon, 25 Nov 2024 22:03:13 +0000 (17:03 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Sat, 21 Dec 2024 06:36:20 +0000 (01:36 -0500)
6.11 had a bug where we'd sometimes create disk accounting keys with
version 0, which causes issues for journal replay - but we don't need to
delete existing accounting keys with version 0.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/disk_accounting.c

index bb5dbbf71d047df3adec7f56107948fea89641cb..c5e61265b7098cd85b9f7f8fd74767c8424f23e9 100644 (file)
@@ -134,7 +134,8 @@ int bch2_accounting_validate(struct bch_fs *c, struct bkey_s_c k,
        void *end = &acc_k + 1;
        int ret = 0;
 
-       bkey_fsck_err_on(bversion_zero(k.k->bversion),
+       bkey_fsck_err_on((flags & BCH_VALIDATE_commit) &&
+                        bversion_zero(k.k->bversion),
                         c, accounting_key_version_0,
                         "accounting key with version=0");