Update bcachefs sources to 5963d1b1a4 bcacehfs: Fix bch2_get_alloc_in_memory_pos()

[bcachefs-tools-debian] / libbcachefs / btree_key_cache.c

diff --git a/libbcachefs/btree_key_cache.c b/libbcachefs/btree_key_cache.c
index 634c67318a8da84cdaca37f6060dcbf42732df8e..dcd1a4796efe29e5260b8ea7e5325ab9bad3dd37 100644 (file)
--- a/libbcachefs/btree_key_cache.c
+++ b/libbcachefs/btree_key_cache.c
@@ -27,8 +27,8 @@ static int bch2_btree_key_cache_cmp_fn(struct rhashtable_compare_arg *arg,
        const struct bkey_cached *ck = obj;
        const struct bkey_cached_key *key = arg->key;
 
-       return cmp_int(ck->key.btree_id, key->btree_id) ?:
-               bpos_cmp(ck->key.pos, key->pos);
+       return ck->key.btree_id != key->btree_id ||
+               !bpos_eq(ck->key.pos, key->pos);
 }
 
 static const struct rhashtable_params bch2_btree_key_cache_params = {
@@ -476,7 +476,7 @@ retry:
                BUG_ON(ret);
 
                if (ck->key.btree_id != path->btree_id ||
-                   bpos_cmp(ck->key.pos, path->pos)) {
+                   !bpos_eq(ck->key.pos, path->pos)) {
                        six_unlock_type(&ck->c.lock, lock_want);
                        goto retry;
                }
@@ -550,7 +550,7 @@ retry:
                        return ret;
 
                if (ck->key.btree_id != path->btree_id ||
-                   bpos_cmp(ck->key.pos, path->pos)) {
+                   !bpos_eq(ck->key.pos, path->pos)) {
                        six_unlock_type(&ck->c.lock, lock_want);
                        goto retry;
                }