diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2013-07-24 18:04:18 -0700 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-10 21:56:09 -0800 |
| commit | b54d6934da7857f87b092df9b77dc1f42818ba94 (patch) | |
| tree | f505788c5308287f65c0b2bc58e9ff358f336d03 /drivers/md/bcache/journal.c | |
| parent | c18536a72ddd7fe30d63e6c1500b5c930ac14594 (diff) | |
| download | lwn-b54d6934da7857f87b092df9b77dc1f42818ba94.tar.gz lwn-b54d6934da7857f87b092df9b77dc1f42818ba94.zip | |
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/journal.c')
| -rw-r--r-- | drivers/md/bcache/journal.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index 725c8eb9a62a..20e900ad5010 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -305,8 +305,7 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list) struct btree_op op; bch_keylist_init(&keylist); - bch_btree_op_init_stack(&op); - op.lock = SHRT_MAX; + bch_btree_op_init(&op, SHRT_MAX); list_for_each_entry(i, list, list) { BUG_ON(i->pin && atomic_read(i->pin) != 1); @@ -341,14 +340,13 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list) pr_info("journal replay done, %i keys in %i entries, seq %llu", keys, entries, end); - +err: while (!list_empty(list)) { i = list_first_entry(list, struct journal_replay, list); list_del(&i->list); kfree(i); } -err: - closure_sync(&op.cl); + return ret; } |