From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 21 May 2019 14:14:54 +0000 (-0400)
Subject: bcachefs: fix bch2_extent_merge()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a62c78a794c2cf6ed08a1a7b25887a1935e87835;p=linux.git

bcachefs: fix bch2_extent_merge()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c
index d8d128cae5b4a..c5a0d6c8e63ae 100644
--- a/fs/bcachefs/extents.c
+++ b/fs/bcachefs/extents.c
@@ -1529,6 +1529,9 @@ enum merge_result bch2_extent_merge(struct bch_fs *c,
 	union bch_extent_entry *en_r = er.v->start;
 	struct bch_extent_crc_unpacked crc_l, crc_r;
 
+	if (bkey_val_u64s(&l->k) != bkey_val_u64s(&r->k))
+		return BCH_MERGE_NOMERGE;
+
 	crc_l = bch2_extent_crc_unpack(el.k, NULL);
 
 	extent_for_each_entry(el, en_l) {