diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-11-26 17:09:59 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-11-26 17:09:59 -0500 |
| commit | 934a84dfaf719af82dadbbe0e2480baff03c905b (patch) | |
| tree | 22deb77e752f90c842ac2f8dce91f5a602afd49d /libbcachefs/bkey_methods.h | |
| parent | 48eefee7495c6e145f3fcfe6ab83f9e8bc27a1ec (diff) | |
Update bcachefs sources to 5963d1b1a4 bcacehfs: Fix bch2_get_alloc_in_memory_pos()
Diffstat (limited to 'libbcachefs/bkey_methods.h')
| -rw-r--r-- | libbcachefs/bkey_methods.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbcachefs/bkey_methods.h b/libbcachefs/bkey_methods.h index 4739b3c3..2cbb0f39 100644 --- a/libbcachefs/bkey_methods.h +++ b/libbcachefs/bkey_methods.h @@ -60,7 +60,7 @@ static inline bool bch2_bkey_maybe_mergable(const struct bkey *l, const struct b { return l->type == r->type && !bversion_cmp(l->version, r->version) && - !bpos_cmp(l->p, bkey_start_pos(r)) && + bpos_eq(l->p, bkey_start_pos(r)) && (u64) l->size + r->size <= KEY_SIZE_MAX && bch2_bkey_ops[l->type].key_merge && !bch2_key_merging_disabled; |