From: Kent Overstreet Date: Sun, 10 Jan 2021 18:38:09 +0000 (-0500) Subject: bcachefs: Fix bch2_replicas_gc2 X-Git-Tag: v6.7-rc1~201^2~1849 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53ef2c5cc991a9c5aecc7b85754695df5cc5de45;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Fix bch2_replicas_gc2 This fixes a regression introduced by "bcachefs: Refactor filesystem usage accounting". We have to include all the replicas entries that have any of the entries for different journal entries nonzero, we can't skip them if they sum to zero. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/replicas.c b/fs/bcachefs/replicas.c index 57c2e66edad17..a0840e1c9f882 100644 --- a/fs/bcachefs/replicas.c +++ b/fs/bcachefs/replicas.c @@ -607,7 +607,11 @@ retry: cpu_replicas_entry(&c->replicas, i); if (e->data_type == BCH_DATA_journal || - bch2_fs_usage_read_one(c, &c->usage_base->replicas[i])) + c->usage_base->replicas[i] || + percpu_u64_get(&c->usage[0]->replicas[i]) || + percpu_u64_get(&c->usage[1]->replicas[i]) || + percpu_u64_get(&c->usage[2]->replicas[i]) || + percpu_u64_get(&c->usage[3]->replicas[i])) memcpy(cpu_replicas_entry(&new, new.nr++), e, new.entry_size); }