diff options
| author |   Kent Overstreet <kmo@daterainc.com> | 2013-07-24 18:07:22 -0700 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-10 21:56:31 -0800 |
| commit | cc7b8819212f437fc82f0f9cdc24deb0fb5d775f (patch) | |
| tree | 14ded946ae7c66901ea6d9056bca88c818a0b66d /drivers/md/bcache/journal.c | |
| parent | bcache: Don't use op->insert_collision (diff) | |
| download | linux-dev-cc7b8819212f437fc82f0f9cdc24deb0fb5d775f.tar.xz linux-dev-cc7b8819212f437fc82f0f9cdc24deb0fb5d775f.zip | |
bcache: Convert bch_btree_insert() to bch_btree_map_leaf_nodes()
Last of the btree_map() conversions. Main visible effect is
bch_btree_insert() is no longer taking a struct btree_op as an argument
anymore - there's no fancy state machine stuff going on, it's just a
normal function.
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/journal.c')
| -rw-r--r-- | drivers/md/bcache/journal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index 592adf51128f..86de64a6bf26 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -302,10 +302,8 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list) uint64_t start = i->j.last_seq, end = i->j.seq, n = start; struct keylist keylist; - struct btree_op op; bch_keylist_init(&keylist); - bch_btree_op_init(&op, SHRT_MAX); list_for_each_entry(i, list, list) { BUG_ON(i->pin && atomic_read(i->pin) != 1); @@ -322,7 +320,7 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list) bkey_copy(keylist.top, k); bch_keylist_push(&keylist); - ret = bch_btree_insert(&op, s, &keylist, i->pin, NULL); + ret = bch_btree_insert(s, &keylist, i->pin, NULL); if (ret) goto err; |