openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bcache: Kill bch_next_recurse_key() 

This dates from before the btree iterator, and now it's finally gone

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
This commit is contained in:
Kent Overstreet 2013-09-10 17:18:59 -07:00
parent bc9389eefe
commit 50310164bc
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/md/bcache/bset.c
View File

@ -952,14 +952,6 @@ struct bkey *bch_btree_iter_next_filter(struct btree_iter *iter,
return ret;
}
struct bkey *bch_next_recurse_key(struct btree *b, struct bkey *search)
{
struct btree_iter iter;
bch_btree_iter_init(b, &iter, search);
return bch_btree_iter_next_filter(&iter, b, bch_ptr_bad);
}
/* Mergesort */
static void sort_key_next(struct btree_iter *iter,

1
drivers/md/bcache/bset.h
View File

@ -303,7 +303,6 @@ static inline bool ptr_available(struct cache_set *c, const struct bkey *k,
typedef bool (*ptr_filter_fn)(struct btree *, const struct bkey *);
struct bkey *bch_next_recurse_key(struct btree *, struct bkey *);
struct bkey *bch_btree_iter_next(struct btree_iter *);
struct bkey *bch_btree_iter_next_filter(struct btree_iter *,
struct btree *, ptr_filter_fn);

23
drivers/md/bcache/btree.c
View File

@ -1680,9 +1680,9 @@ int bch_gc_thread_start(struct cache_set *c)
static int bch_btree_check_recurse(struct btree *b, struct btree_op *op,
unsigned long **seen)
{
int ret;
int ret = 0;
unsigned i;
struct bkey *k;
struct bkey *k, *p = NULL;
struct bucket *g;
struct btree_iter iter;
@ -1709,19 +1709,18 @@ static int bch_btree_check_recurse(struct btree *b, struct btree_op *op,
}
if (b->level) {
k = bch_next_recurse_key(b, &ZERO_KEY);
bch_btree_iter_init(b, &iter, NULL);
do {
k = bch_btree_iter_next_filter(&iter, b, bch_ptr_bad);
if (k)
btree_node_prefetch(b->c, k, b->level - 1);
while (k) {
struct bkey *p = bch_next_recurse_key(b, k);
if (p)
btree_node_prefetch(b->c, p, b->level - 1);
ret = btree(check_recurse, p, b, op, seen);
ret = btree(check_recurse, k, b, op, seen);
if (ret)
return ret;
k = p;
}
p = k;
} while (p && !ret);
}
return 0;