summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-01-22 13:46:14 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2019-04-03 12:44:04 -0400
commit9bbef4f85ed2dccddf459917f9db09a447b7cb57 (patch)
treed05bcf40f4c32eb07cf4e4470f19e51fb643b094
parentc8f5393792d1c6fd5a45eb4d8e49864eb740493f (diff)
bcachefs: Improve c version of __bkey_cmp_bits
-rw-r--r--fs/bcachefs/bkey.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/bcachefs/bkey.c b/fs/bcachefs/bkey.c
index 25725e423055..40ce33a40d79 100644
--- a/fs/bcachefs/bkey.c
+++ b/fs/bcachefs/bkey.c
@@ -1010,11 +1010,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);
@@ -1022,6 +1019,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