diff options
author | Kent Overstreet <kmo@daterainc.com> | 2013-07-24 21:04:18 -0400 |
---|---|---|
committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-11 00:56:09 -0500 |
commit | b54d6934da7857f87b092df9b77dc1f42818ba94 (patch) | |
tree | f505788c5308287f65c0b2bc58e9ff358f336d03 /drivers/md/bcache/btree.h | |
parent | c18536a72ddd7fe30d63e6c1500b5c930ac14594 (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/btree.h')
-rw-r--r-- | drivers/md/bcache/btree.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/md/bcache/btree.h b/drivers/md/bcache/btree.h index 3f820b67150c..34ee5359b262 100644 --- a/drivers/md/bcache/btree.h +++ b/drivers/md/bcache/btree.h | |||
@@ -237,8 +237,6 @@ void __bkey_put(struct cache_set *c, struct bkey *k); | |||
237 | /* Recursing down the btree */ | 237 | /* Recursing down the btree */ |
238 | 238 | ||
239 | struct btree_op { | 239 | struct btree_op { |
240 | struct closure cl; | ||
241 | |||
242 | /* Btree level at which we start taking write locks */ | 240 | /* Btree level at which we start taking write locks */ |
243 | short lock; | 241 | short lock; |
244 | 242 | ||
@@ -253,7 +251,11 @@ struct btree_op { | |||
253 | BKEY_PADDED(replace); | 251 | BKEY_PADDED(replace); |
254 | }; | 252 | }; |
255 | 253 | ||
256 | void bch_btree_op_init_stack(struct btree_op *); | 254 | static inline void bch_btree_op_init(struct btree_op *op, int write_lock_level) |
255 | { | ||
256 | memset(op, 0, sizeof(struct btree_op)); | ||
257 | op->lock = write_lock_level; | ||
258 | } | ||
257 | 259 | ||
258 | static inline void rw_lock(bool w, struct btree *b, int level) | 260 | static inline void rw_lock(bool w, struct btree *b, int level) |
259 | { | 261 | { |