From a0181ca833921f24b582afff79b2770893946c8e Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 24 Feb 2025 10:21:59 -0800 Subject: [PATCH] xfs_repair: tidy up rmap_diffkeys Tidy up the comparison code in this function to match the kernel. Signed-off-by: "Darrick J. Wong" Reviewed-by: Christoph Hellwig --- repair/rmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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; -- 2.47.2