diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2013-07-25 03:07:22 +0200 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-11 06:56:31 +0100 |
| commit | cc7b8819212f437fc82f0f9cdc24deb0fb5d775f (patch) | |
| tree | 14ded946ae7c66901ea6d9056bca88c818a0b66d /drivers/md/bcache/writeback.c | |
| parent | bcache: Don't use op->insert_collision (diff) | |
| download | linux-cc7b8819212f437fc82f0f9cdc24deb0fb5d775f.tar.xz linux-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/writeback.c')
| -rw-r--r-- | drivers/md/bcache/writeback.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index 312032ef34f7..ab0f6b449111 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c @@ -139,12 +139,10 @@ static void write_dirty_finish(struct closure *cl) /* This is kind of a dumb way of signalling errors. */ if (KEY_DIRTY(&w->key)) { + int ret; unsigned i; - struct btree_op op; struct keylist keys; - int ret; - bch_btree_op_init(&op, -1); bch_keylist_init(&keys); bkey_copy(keys.top, &w->key); @@ -154,7 +152,7 @@ static void write_dirty_finish(struct closure *cl) for (i = 0; i < KEY_PTRS(&w->key); i++) atomic_inc(&PTR_BUCKET(dc->disk.c, &w->key, i)->pin); - ret = bch_btree_insert(&op, dc->disk.c, &keys, NULL, &w->key); + ret = bch_btree_insert(dc->disk.c, &keys, NULL, &w->key); if (ret) trace_bcache_writeback_collision(&w->key); |