summaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/btree.h
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-07-24 18:04:18 -0700
committerKent Overstreet <kmo@daterainc.com>2013-11-10 21:56:09 -0800
commitb54d6934da7857f87b092df9b77dc1f42818ba94 (patch)
treef505788c5308287f65c0b2bc58e9ff358f336d03 /drivers/md/bcache/btree.h
parentc18536a72ddd7fe30d63e6c1500b5c930ac14594 (diff)
downloadlinux-b54d6934da7857f87b092df9b77dc1f42818ba94.tar.bz2
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.h8
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);
/* Recursing down the btree */
struct btree_op {
- struct closure cl;
-
/* Btree level at which we start taking write locks */
short lock;
@@ -253,7 +251,11 @@ struct btree_op {
BKEY_PADDED(replace);
};
-void bch_btree_op_init_stack(struct btree_op *);
+static inline void bch_btree_op_init(struct btree_op *op, int write_lock_level)
+{
+ memset(op, 0, sizeof(struct btree_op));
+ op->lock = write_lock_level;
+}
static inline void rw_lock(bool w, struct btree *b, int level)
{