From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 13 Jun 2025 21:47:07 +0000 (-0400)
Subject: bcachefs: Fix "now allowing incompatible features" message
X-Git-Tag: v6.16-rc4~24^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1ccd43b357e157d78c899e61764fc83b4d1dbaa;p=thirdparty%2Flinux.git

bcachefs: Fix "now allowing incompatible features" message

Check against version_incompat_allowed, not version_incompat.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 6aef8b101820..820249e9c5ea 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -692,7 +692,7 @@ static bool check_version_upgrade(struct bch_fs *c)
 		ret = true;
 	}
 
-	if (new_version > c->sb.version_incompat &&
+	if (new_version > c->sb.version_incompat_allowed &&
 	    c->opts.version_upgrade == BCH_VERSION_UPGRADE_incompatible) {
 		struct printbuf buf = PRINTBUF;