From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Tue, 29 Aug 2023 10:31:35 +0000 (+0200)
Subject: libblkid: (jmicron_raid) use checksum APIs
X-Git-Tag: v2.40-rc1~259^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=272457b71bed808c39fad3ec390ad43118d28899;p=thirdparty%2Futil-linux.git

libblkid: (jmicron_raid) use checksum APIs

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---

diff --git a/libblkid/src/superblocks/jmicron_raid.c b/libblkid/src/superblocks/jmicron_raid.c
index cd84c9dcbc..65e05b624d 100644
--- a/libblkid/src/superblocks/jmicron_raid.c
+++ b/libblkid/src/superblocks/jmicron_raid.c
@@ -51,22 +51,22 @@ struct jm_metadata {
 	uint8_t		filler2[0x20];
 } __attribute__ ((packed));
 
-static int jm_checksum(const struct jm_metadata *jm)
+static int jm_checksum(blkid_probe pr, const struct jm_metadata *jm)
 {
-        size_t count = sizeof(*jm) / sizeof(uint16_t);
-        uint16_t sum = 0;
-        unsigned char *ptr = (unsigned char *) jm;
+	size_t count = sizeof(*jm) / sizeof(uint16_t);
+	uint16_t sum = 0;
+	unsigned char *ptr = (unsigned char *) jm;
 
-        while (count--) {
-                uint16_t val;
+	while (count--) {
+		uint16_t val;
 
-                memcpy(&val, ptr, sizeof(uint16_t));
-                sum += le16_to_cpu(val);
+		memcpy(&val, ptr, sizeof(uint16_t));
+		sum += le16_to_cpu(val);
 
-                ptr += sizeof(uint16_t);
-        }
+		ptr += sizeof(uint16_t);
+	}
 
-        return sum == 0 || sum == 1;
+	return blkid_probe_verify_csum(pr, sum == 0 || sum == 1, 1);
 }
 
 static int probe_jmraid(blkid_probe pr,
@@ -91,7 +91,7 @@ static int probe_jmraid(blkid_probe pr,
 	if (memcmp(jm->signature, JM_SIGNATURE, sizeof(JM_SIGNATURE) - 1) != 0)
 		return 1;
 
-	if (!jm_checksum(jm))
+	if (!jm_checksum(pr, jm))
 		return 1;
 
 	if (jm->mode > 5)