[PATCH 1/1] bcache: remove dupplicated declaration from btree.h
From: Coly Li <hidden>
Date: 2020-03-25 01:31:06
Also in:
linux-block
Subsystem:
bcache (block layer cache), the rest · Maintainers:
Coly Li, Kent Overstreet, Linus Torvalds
Commit ab544165dc2d ("bcache: move macro btree() and btree_root()
into btree.h") makes two duplicated declaration into btree.h,
typedef int (btree_map_keys_fn)();
int bch_btree_map_keys();
The kbuild test robot [off-list ref] detects and reports this
problem and this patch fixes it by removing the duplicated ones.
Fixes: ab544165dc2d ("bcache: move macro btree() and btree_root() into btree.h")
Reported-by: kbuild test robot <redacted>
Signed-off-by: Coly Li <redacted>
---
drivers/md/bcache/btree.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/md/bcache/btree.h b/drivers/md/bcache/btree.h
index 7c884f278da8..257969980c49 100644
--- a/drivers/md/bcache/btree.h
+++ b/drivers/md/bcache/btree.h@@ -282,13 +282,6 @@ void bch_initial_gc_finish(struct cache_set *c); void bch_moving_gc(struct cache_set *c); int bch_btree_check(struct cache_set *c); void bch_initial_mark_key(struct cache_set *c, int level, struct bkey *k); -typedef int (btree_map_keys_fn)(struct btree_op *op, struct btree *b, - struct bkey *k); -int bch_btree_map_keys_recurse(struct btree *b, struct btree_op *op, - struct bkey *from, btree_map_keys_fn *fn, - int flags); -int bch_btree_map_keys(struct btree_op *op, struct cache_set *c, - struct bkey *from, btree_map_keys_fn *fn, int flags); static inline void wake_up_gc(struct cache_set *c) {
@@ -402,6 +395,9 @@ typedef int (btree_map_keys_fn)(struct btree_op *op, struct btree *b, struct bkey *k); int bch_btree_map_keys(struct btree_op *op, struct cache_set *c, struct bkey *from, btree_map_keys_fn *fn, int flags); +int bch_btree_map_keys_recurse(struct btree *b, struct btree_op *op, + struct bkey *from, btree_map_keys_fn *fn, + int flags); typedef bool (keybuf_pred_fn)(struct keybuf *buf, struct bkey *k);
--
2.25.0