aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/writeback.c
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-07-24 21:04:18 -0400
committerKent Overstreet <kmo@daterainc.com>2013-11-11 00:56:09 -0500
commitb54d6934da7857f87b092df9b77dc1f42818ba94 (patch)
treef505788c5308287f65c0b2bc58e9ff358f336d03 /drivers/md/bcache/writeback.c
parentc18536a72ddd7fe30d63e6c1500b5c930ac14594 (diff)
bcache: Kill op->cl
This isn't used for waiting asynchronously anymore - so this is a fairly trivial refactoring. Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/writeback.c')
-rw-r--r--drivers/md/bcache/writeback.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c
index b58c2bc91e3f..d0968e8938f7 100644
--- a/drivers/md/bcache/writeback.c
+++ b/drivers/md/bcache/writeback.c
@@ -143,7 +143,7 @@ static void write_dirty_finish(struct closure *cl)
143 struct btree_op op; 143 struct btree_op op;
144 struct keylist keys; 144 struct keylist keys;
145 145
146 bch_btree_op_init_stack(&op); 146 bch_btree_op_init(&op, -1);
147 bch_keylist_init(&keys); 147 bch_keylist_init(&keys);
148 148
149 op.type = BTREE_REPLACE; 149 op.type = BTREE_REPLACE;
@@ -156,7 +156,6 @@ static void write_dirty_finish(struct closure *cl)
156 atomic_inc(&PTR_BUCKET(dc->disk.c, &w->key, i)->pin); 156 atomic_inc(&PTR_BUCKET(dc->disk.c, &w->key, i)->pin);
157 157
158 bch_btree_insert(&op, dc->disk.c, &keys, NULL); 158 bch_btree_insert(&op, dc->disk.c, &keys, NULL);
159 closure_sync(&op.cl);
160 159
161 if (op.insert_collision) 160 if (op.insert_collision)
162 trace_bcache_writeback_collision(&w->key); 161 trace_bcache_writeback_collision(&w->key);
@@ -457,7 +456,7 @@ void bch_sectors_dirty_init(struct cached_dev *dc)
457{ 456{
458 struct sectors_dirty_init op; 457 struct sectors_dirty_init op;
459 458
460 bch_btree_op_init_stack(&op.op); 459 bch_btree_op_init(&op.op, -1);
461 op.inode = dc->disk.id; 460 op.inode = dc->disk.id;
462 461
463 bch_btree_map_keys(&op.op, dc->disk.c, &KEY(op.inode, 0, 0), 462 bch_btree_map_keys(&op.op, dc->disk.c, &KEY(op.inode, 0, 0),