summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/bkey.h
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2020-03-24 17:00:48 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 17:08:37 -0400
commit47143a75e01354ee0daef6667cbe7b08bd89ed84 (patch)
tree909c094f8bff7ff662e6eb276f0f824f7e8e2328 /fs/bcachefs/bkey.h
parent0728eed7b6ec673d2b6e0f86b6daf240a2948292 (diff)
downloadlinux-47143a75e01354ee0daef6667cbe7b08bd89ed84.tar.gz
linux-47143a75e01354ee0daef6667cbe7b08bd89ed84.tar.bz2
linux-47143a75e01354ee0daef6667cbe7b08bd89ed84.zip
bcachefs: Disable extent merging
Extent merging is currently broken, and will be reimplemented differently soon - right now it only happens when btree nodes are being compacted, which makes it difficult to test. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/bkey.h')
-rw-r--r--fs/bcachefs/bkey.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bcachefs/bkey.h b/fs/bcachefs/bkey.h
index aa729347e448..98733363c161 100644
--- a/fs/bcachefs/bkey.h
+++ b/fs/bcachefs/bkey.h
@@ -408,9 +408,8 @@ static inline int bch2_compile_bkey_format(const struct bkey_format *format,
static inline void bkey_reassemble(struct bkey_i *dst,
struct bkey_s_c src)
{
- BUG_ON(bkey_packed(src.k));
dst->k = *src.k;
- memcpy_u64s(&dst->v, src.v, bkey_val_u64s(src.k));
+ memcpy_u64s_small(&dst->v, src.v, bkey_val_u64s(src.k));
}
#define bkey_s_null ((struct bkey_s) { .k = NULL })