diff options
| author | Coly Li <colyli@suse.de> | 2020-03-25 09:30:57 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-03-24 19:56:42 -0600 |
| commit | 5ae3a2c03d1f5b33f53ce2ba2e57773fc8b35128 (patch) | |
| tree | 55138cd8d328fc8f4dba8d102f864cb801f797ac | |
| parent | eb9b6666d6ca6f3d9f218fa23ec6135eee1ac3a7 (diff) | |
| download | lwn-5ae3a2c03d1f5b33f53ce2ba2e57773fc8b35128.tar.gz lwn-5ae3a2c03d1f5b33f53ce2ba2e57773fc8b35128.zip | |
bcache: remove dupplicated declaration from btree.h
Commit 253a99d95d5b ("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: 253a99d95d5b ("bcache: move macro btree() and btree_root() into btree.h")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/md/bcache/btree.h | 10 |
1 files 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); |