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 bd91c721e20e4e4a979f0eb7f1041d0df2025e71..2065bdc0b190badc2f5044e949389b1232d8cef6 100644 (file)
--- 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;