diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-05-01 07:23:05 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-05-01 07:23:05 (GMT) |
| commit | f50efd2fdbd9b35b11f5778ed85beb764184bda9 (patch) | |
| tree | ed92b40995d60136fb387d210886e4aae2c37231 /drivers/md/bcache/btree.c | |
| parent | 0821e904057505c7e25d72e1a282105d023b26c9 (diff) | |
| parent | ee66850642efda91d04179cae2414310675a1f73 (diff) | |
| download | linux-f50efd2fdbd9b35b11f5778ed85beb764184bda9.tar.xz | |
Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers
Kent writes:
Hey Jens, this is everything I've got ready for 3.10 - there's _still_
one more bug I'm trying to track down.
Andrew - I've got patches that rip out the pkey() and pbtree() macros,
but they're somewhat tied up with some other nontrivial refactorings so
I think I'm going to wait a bit on those.
Diffstat (limited to 'drivers/md/bcache/btree.c')
| -rw-r--r-- | drivers/md/bcache/btree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 8523407..7a5658f 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -984,7 +984,7 @@ static void btree_node_free(struct btree *b, struct btree_op *op) if (b->prio_blocked && !atomic_sub_return(b->prio_blocked, &b->c->prio_blocked)) - closure_wake_up(&b->c->bucket_wait); + wake_up(&b->c->alloc_wait); b->prio_blocked = 0; @@ -1548,7 +1548,6 @@ static void bch_btree_gc(struct closure *cl) trace_bcache_gc_end(c->sb.set_uuid); wake_up(&c->alloc_wait); - closure_wake_up(&c->bucket_wait); continue_at(cl, bch_moving_gc, bch_gc_wq); } |