From: Darrick J. Wong <djwong@kernel.org>
Date: Mon, 24 Feb 2025 18:21:59 +0000 (-0800)
Subject: xfs_repair: tidy up rmap_diffkeys
X-Git-Tag: v6.14.0~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0181ca833921f24b582afff79b2770893946c8e;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: tidy up rmap_diffkeys

Tidy up the comparison code in this function to match the kernel.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/repair/rmap.c b/repair/rmap.c
index bd91c721..2065bdc0 100644
--- a/repair/rmap.c
+++ b/repair/rmap.c
@@ -1267,7 +1267,6 @@ rmap_diffkeys(
 {
 	__u64			oa;
 	__u64			ob;
-	int64_t			d;
 	struct xfs_rmap_irec	tmp;
 
 	tmp = *kp1;
@@ -1277,9 +1276,10 @@ rmap_diffkeys(
 	tmp.rm_flags &= ~XFS_RMAP_REC_FLAGS;
 	ob = libxfs_rmap_irec_offset_pack(&tmp);
 
-	d = (int64_t)kp1->rm_startblock - kp2->rm_startblock;
-	if (d)
-		return d;
+	if (kp1->rm_startblock > kp2->rm_startblock)
+		return 1;
+	else if (kp2->rm_startblock > kp1->rm_startblock)
+		return -1;
 
 	if (kp1->rm_owner > kp2->rm_owner)
 		return 1;