diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-11-07 11:26:00 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-11-07 13:09:23 -0500 |
| commit | d2a118d921dfdf43adfa37aed1d9df62925bda66 (patch) | |
| tree | 0bc9aae1b3f3e3ea1c06afb162e393bbce48d0da /libbcachefs/bkey_methods.c | |
| parent | 742dbbdbb90efb786f05a8576917fcd0e9cbd57e (diff) | |
Update bcachefs sources to 1d669389f7 bcachefs: use a radix tree for inum bitmap in fsck
Diffstat (limited to 'libbcachefs/bkey_methods.c')
| -rw-r--r-- | libbcachefs/bkey_methods.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbcachefs/bkey_methods.c b/libbcachefs/bkey_methods.c index 32849229..99b7fce2 100644 --- a/libbcachefs/bkey_methods.c +++ b/libbcachefs/bkey_methods.c @@ -236,7 +236,7 @@ enum merge_result bch2_bkey_merge(struct bch_fs *c, const struct bkey_ops *ops = &bch2_bkey_ops[l.k->type]; enum merge_result ret; - if (key_merging_disabled(c) || + if (bch2_key_merging_disabled || !ops->key_merge || l.k->type != r.k->type || bversion_cmp(l.k->version, r.k->version) || |