X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs%2Fbkey_sort.c;h=b1385a77da1146f6efd643d389a73aa999745244;hb=70f2681838973f20a918b518f82d382b3556963d;hp=537ab7919e886eec958e49e12e6b18962172e725;hpb=a2094890a90a2f865e49f94e8448deca7e5852ef;p=bcachefs-tools-debian

diff --git a/libbcachefs/bkey_sort.c b/libbcachefs/bkey_sort.c
index 537ab79..b1385a7 100644
--- a/libbcachefs/bkey_sort.c
+++ b/libbcachefs/bkey_sort.c
@@ -117,23 +117,6 @@ bch2_key_sort_fix_overlapping(struct bch_fs *c, struct bset *dst,
 	return nr;
 }
 
-static void extent_sort_append(struct bch_fs *c,
-			       struct bkey_format *f,
-			       struct btree_nr_keys *nr,
-			       struct bkey_packed **out,
-			       struct bkey_s k)
-{
-	if (!bkey_deleted(k.k)) {
-		if (!bch2_bkey_pack_key(*out, k.k, f))
-			memcpy_u64s_small(*out, k.k, BKEY_U64s);
-
-		memcpy_u64s_small(bkeyp_val(f, *out), k.v, bkey_val_u64s(k.k));
-
-		btree_keys_account_key_add(nr, 0, *out);
-		*out = bkey_next(*out);
-	}
-}
-
 /* Sort + repack in a new format: */
 struct btree_nr_keys
 bch2_sort_repack(struct bset *dst, struct btree *src,
@@ -144,6 +127,7 @@ bch2_sort_repack(struct bset *dst, struct btree *src,
 	struct bkey_format *in_f = &src->format;
 	struct bkey_packed *in, *out = vstruct_last(dst);
 	struct btree_nr_keys nr;
+	bool transform = memcmp(out_f, &src->format, sizeof(*out_f));
 
 	memset(&nr, 0, sizeof(nr));
 
@@ -151,8 +135,10 @@ bch2_sort_repack(struct bset *dst, struct btree *src,
 		if (filter_whiteouts && bkey_deleted(in))
 			continue;
 
-		if (bch2_bkey_transform(out_f, out, bkey_packed(in)
-				       ? in_f : &bch2_bkey_format_current, in))
+		if (!transform)
+			bkey_copy(out, in);
+		else if (bch2_bkey_transform(out_f, out, bkey_packed(in)
+					     ? in_f : &bch2_bkey_format_current, in))
 			out->format = KEY_FORMAT_LOCAL_BTREE;
 		else
 			bch2_bkey_unpack(src, (void *) out, in);
@@ -165,47 +151,6 @@ bch2_sort_repack(struct bset *dst, struct btree *src,
 	return nr;
 }
 
-/* Sort, repack, and call bch2_bkey_normalize() to drop stale pointers: */
-struct btree_nr_keys
-bch2_sort_repack_merge(struct bch_fs *c,
-		       struct bset *dst, struct btree *src,
-		       struct btree_node_iter *iter,
-		       struct bkey_format *out_f,
-		       bool filter_whiteouts)
-{
-	struct bkey_packed *out = vstruct_last(dst), *k_packed;
-	struct bkey_buf k;
-	struct btree_nr_keys nr;
-
-	memset(&nr, 0, sizeof(nr));
-	bch2_bkey_buf_init(&k);
-
-	while ((k_packed = bch2_btree_node_iter_next_all(iter, src))) {
-		if (filter_whiteouts && bkey_deleted(k_packed))
-			continue;
-
-		/*
-		 * NOTE:
-		 * bch2_bkey_normalize may modify the key we pass it (dropping
-		 * stale pointers) and we don't have a write lock on the src
-		 * node; we have to make a copy of the entire key before calling
-		 * normalize
-		 */
-		bch2_bkey_buf_realloc(&k, c, k_packed->u64s + BKEY_U64s);
-		bch2_bkey_unpack(src, k.k, k_packed);
-
-		if (filter_whiteouts &&
-		    bch2_bkey_normalize(c, bkey_i_to_s(k.k)))
-			continue;
-
-		extent_sort_append(c, out_f, &nr, &out, bkey_i_to_s(k.k));
-	}
-
-	dst->u64s = cpu_to_le16((u64 *) out - dst->_data);
-	bch2_bkey_buf_exit(&k, c);
-	return nr;
-}
-
 static inline int sort_keys_cmp(struct btree *b,
 				struct bkey_packed *l,
 				struct bkey_packed *r)