From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 22 Jan 2019 18:46:14 +0000 (-0500)
Subject: bcachefs: Improve c version of __bkey_cmp_bits
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ed1646ca7412151dbdd81f4e4d05437cc99e9c8c;p=linux.git

bcachefs: Improve c version of __bkey_cmp_bits

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/bkey.c b/fs/bcachefs/bkey.c
index d35cdde299c49..8a3295ff96311 100644
--- a/fs/bcachefs/bkey.c
+++ b/fs/bcachefs/bkey.c
@@ -1014,11 +1014,8 @@ static inline int __bkey_cmp_bits(const u64 *l, const u64 *r,
 			nr_key_bits -= 64;
 		}
 
-		if (l_v != r_v)
-			return l_v < r_v ? -1 : 1;
-
-		if (!nr_key_bits)
-			return 0;
+		if (!nr_key_bits || l_v != r_v)
+			break;
 
 		l = next_word(l);
 		r = next_word(r);
@@ -1026,6 +1023,8 @@ static inline int __bkey_cmp_bits(const u64 *l, const u64 *r,
 		l_v = *l;
 		r_v = *r;
 	}
+
+	return (l_v > r_v) - (l_v < r_v);
 }
 #endif