diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2024-02-27 10:09:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2024-02-27 10:09:49 +0100 |
| commit | 9b9c280b9af2aa851d83e7d0b79f36a3d869d745 (patch) | |
| tree | b61cf8566669d9615234e87696a833ee487e2655 /fs/bcachefs/super.c | |
| parent | x86/apic: Build the x86 topology enumeration functions on UP APIC builds too (diff) | |
| parent | x86/bugs: Use fixed addressing for VERW operand (diff) | |
| download | linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.gz linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.bz2 linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.zip | |
Merge branch 'x86/urgent' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/bcachefs/super.c')
| -rw-r--r-- | fs/bcachefs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c index b9911402b175..6b23e11825e6 100644 --- a/fs/bcachefs/super.c +++ b/fs/bcachefs/super.c @@ -1428,10 +1428,10 @@ bool bch2_dev_state_allowed(struct bch_fs *c, struct bch_dev *ca, required = max(!(flags & BCH_FORCE_IF_METADATA_DEGRADED) ? c->opts.metadata_replicas - : c->opts.metadata_replicas_required, + : metadata_replicas_required(c), !(flags & BCH_FORCE_IF_DATA_DEGRADED) ? c->opts.data_replicas - : c->opts.data_replicas_required); + : data_replicas_required(c)); return nr_rw >= required; case BCH_MEMBER_STATE_failed: |