bcache: Allocator cleanup/fixes

The main fix is that bch_allocator_thread() wasn't waiting on
garbage collection to finish (if invalidate_buckets had set
ca->invalidate_needs_gc); we need that to make sure the allocator
doesn't spin and potentially block gc from finishing.

Signed-off-by: Kent Overstreet <koverstreet@google.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 852340793777..7a5658f04e62 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);
 }