Commit 5ae3a2c0 authored by Coly Li's avatar Coly Li Committed by Jens Axboe
Browse files

bcache: remove dupplicated declaration from btree.h 



Commit 253a99d9 ("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 <lkp@intel.com> detects and reports this
problem and this patch fixes it by removing the duplicated ones.

Fixes: 253a99d9 ("bcache: move macro btree() and btree_root() into btree.h")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarColy Li <colyli@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent eb9b6666

drivers/md/bcache/btree.h

+3 −7
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE