From baf872304ef94d4ed5c0d7d3a9c849ca15c1b18c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Fri, 10 Feb 2023 03:37:48 +0000
Subject: [PATCH] libblkid: bcachefs: fix new magic detection
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The new bcache-specific magic value was wrong and the new testcase
didn't actually use this magic.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
 libblkid/src/superblocks/bcache.c          |   2 +-
 tests/expected/blkid/low-probe-bcachefs-2  |   6 +++---
 tests/ts/blkid/images-fs/bcachefs-2.img.xz | Bin 988 -> 988 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c
index 1d6ee95190..7e8d78db53 100644
--- a/libblkid/src/superblocks/bcache.c
+++ b/libblkid/src/superblocks/bcache.c
@@ -91,7 +91,7 @@ struct bcachefs_super_block {
 
 /* magic string */
 #define BCACHE_SB_MAGIC     "\xc6\x85\x73\xf6\x4e\x1a\x45\xca\x82\x65\xf5\x7f\x48\xba\x6d\x81"
-#define BCACHEFS_SB_MAGIC   "\x18\x00\x18\x00\x00\x00\x00\x00\xc6\x85\x73\xf6\x4e\x1a\x45\xca"
+#define BCACHEFS_SB_MAGIC   "\xc6\x85\x73\xf6\x66\xce\x90\xa9\xd9\x6a\x60\xcf\x80\x3d\xf7\xef"
 /* magic string len */
 #define BCACHE_SB_MAGIC_LEN (sizeof(BCACHE_SB_MAGIC) - 1)
 /* super block offset */
diff --git a/tests/expected/blkid/low-probe-bcachefs-2 b/tests/expected/blkid/low-probe-bcachefs-2
index 7f053b2c1a..4a6d664c09 100644
--- a/tests/expected/blkid/low-probe-bcachefs-2
+++ b/tests/expected/blkid/low-probe-bcachefs-2
@@ -7,6 +7,6 @@ ID_FS_TYPE=bcachefs
 ID_FS_USAGE=filesystem
 ID_FS_UUID=4fa11b1e-75e6-4210-9167-34e1769c0fe1
 ID_FS_UUID_ENC=4fa11b1e-75e6-4210-9167-34e1769c0fe1
-ID_FS_UUID_SUB=11c0fad3-ce13-4c57-b18b-c6349d75fcdd
-ID_FS_UUID_SUB_ENC=11c0fad3-ce13-4c57-b18b-c6349d75fcdd
-ID_FS_VERSION=24
+ID_FS_UUID_SUB=0a3643b7-c515-47f8-a0ea-91fc38d043d1
+ID_FS_UUID_SUB_ENC=0a3643b7-c515-47f8-a0ea-91fc38d043d1
+ID_FS_VERSION=26
diff --git a/tests/ts/blkid/images-fs/bcachefs-2.img.xz b/tests/ts/blkid/images-fs/bcachefs-2.img.xz
index 21031703ec12a602a759cba138863f0ef3579b57..e796c974cbc90c349d649911e48804773b91f5d9 100644
GIT binary patch
delta 441
zc-jHE0Y?7Z2iymc906339UOmajv2{uQ?h_+F=liZZ>j*Ms#5@BYY^B3f(`CMfiRUM
z8>iC8u+c;T=Es<bXmqWbhoIhNE3N;EPGMIffqlodCsjqhinJX&%he&&J4hsre6K`h
z!r47?&7vr(vd*n;<aHJxP+%U<H=XL0(axzJXHOs9gn>E51=-fp*Op$wJzveS>)V+Z
z1y4R;31h(1O%_W3fOgVdajMSh6nL(t;KPg{g^BJBgeV^$DncT!71VX9ynFd6*a%ZZ
zR`llqvC~x`<vxb`@SEX5ekQo*(7;{Nz9~s<oEh;9XOlStbCW6o8e|-VmNg=;;Nlt@
z|5RFOkzPe?S!y|8vjh1XnkgEHJ{ZA&7Qm1<B7WyVcF5JRwAlo%Xd&?}G$s%5rYZjP
z_~vx?li8S&fcPVH(5siO-9q*cK1*gmDcZ8!)s-W+V6VhIJW!Kv13r@~0V)Kl9X+R$
zbpo6XJo~oRBzA?p7v@TQ_mhkQCX@aG5tCd36q8^BLozE%OCx{)l>h|*7Gei500000
j2rr>#F@yfZ00FiKfPjDkd8`LyvBYQl0ssI200dcD)lS8}

delta 487
zc-jHy0T}+=2iymc906959UOm7PS{R=;|352DBDZqOSFCA8g5&T?UC91ZNw=;Lj#x4
zHHf@euXa_J%Osn*ySQE4f438Hb;?L6##mS(b%@s5Eq`lWo?}oDJsDS{uXsOsoh0;;
z&;qkzD3jSyCc8}NxoPIAoKQw9kb2O9P;NlcY)d@rV;}(QE|2DeBNtx%bS?7UbNSo5
zhG89l_>Um4LBBW`f)Ae<Xff-~UXUn%EDf37^%J?Q-!x>3?SR7M2Vj?s@B27f72Ko@
z<&KR*OGPOHsWwFiAsfFKmCNlH4t;Ggo*w{*-bd0f5tA_jK9e{BPJi*XiNwY7O_O36
zlk|@kgmg409LjNaO}LE(Tux-#pU{$0fv1`jUy7Vit_YM8Dkj%(m?RU~0ANPz5-7Jn
zoxEM8IGMCRC(Q_6H0`Cv2u>OqocgUOncpB>IV0-#WHY-P6?9DSA|_EnnD=b>@*m%|
zJMhH4E?=q-K1*gokdtWvI+I@l5DKhW<mFog{UJ6SlXC)`C@S?PYFBVnqz>~NE-VrN
zB0T^;ttP-g0FSj9T2(pWy`nx=WqwHX(32Jcb1=8BpE!U3l>h|*7Ge2-0062)3LMW4
d{D1%fxCelMfC3544PLRtXZr#G00004Sz5~8(>wqG

-- 
2.47.2