summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/reflink.h
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-04-29 05:49:30 +0200
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 23:09:06 +0200
commit59ba21d99fc7a19d32fc4c2cb21509b8876d8e01 (patch)
tree850853ae1082de0d8a6c00698a795bd9945dca41 /fs/bcachefs/reflink.h
parentbcachefs: Kill trans->updates2 (diff)
downloadlinux-59ba21d99fc7a19d32fc4c2cb21509b8876d8e01.tar.xz
linux-59ba21d99fc7a19d32fc4c2cb21509b8876d8e01.zip
bcachefs: Clean up key merging
This patch simplifies the key merging code by getting rid of partial merges - it's simpler and saner if we just don't merge extents when they'd overflow k->size. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/reflink.h')
-rw-r--r--fs/bcachefs/reflink.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bcachefs/reflink.h b/fs/bcachefs/reflink.h
index bfc785619ee8..68c5cb5a2780 100644
--- a/fs/bcachefs/reflink.h
+++ b/fs/bcachefs/reflink.h
@@ -5,8 +5,7 @@
const char *bch2_reflink_p_invalid(const struct bch_fs *, struct bkey_s_c);
void bch2_reflink_p_to_text(struct printbuf *, struct bch_fs *,
struct bkey_s_c);
-enum merge_result bch2_reflink_p_merge(struct bch_fs *,
- struct bkey_s, struct bkey_s);
+bool bch2_reflink_p_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
#define bch2_bkey_ops_reflink_p (struct bkey_ops) { \
.key_invalid = bch2_reflink_p_invalid, \