36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 72177d492d17031c6cbbb7f6802a23cbdabd37ad Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Mon, 25 Nov 2024 17:03:13 -0500
|
|
Subject: [PATCH 126/233] bcachefs: Change "disk accounting version 0" check to
|
|
commit only
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/disk_accounting.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/fs/bcachefs/disk_accounting.c b/fs/bcachefs/disk_accounting.c
|
|
index bb5dbbf71d04..c5e61265b709 100644
|
|
--- a/fs/bcachefs/disk_accounting.c
|
|
+++ b/fs/bcachefs/disk_accounting.c
|
|
@@ -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");
|
|
|
|
--
|
|
2.45.2
|
|
|