15 files changed, 131 insertions, 74 deletions

diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c
index 443d03fbac47..8eeab72b93e2 100644
--- a/drivers/md/bcache/alloc.c
+++ b/drivers/md/bcache/alloc.c
@@ -331,7 +331,7 @@ static int bch_allocator_thread(void *arg)
                                 mutex_unlock(&ca->set->bucket_lock);
                                 blkdev_issue_discard(ca->bdev,
                                         bucket_to_sector(ca->set, bucket),
-                                        ca->sb.block_size, GFP_KERNEL, 0);
+                                        ca->sb.bucket_size, GFP_KERNEL, 0);
                                 mutex_lock(&ca->set->bucket_lock);
                         }
 
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index d2ebcf323094..04f7bc28ef83 100644
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -477,9 +477,13 @@ struct gc_stat {
  * CACHE_SET_STOPPING always gets set first when we're closing down a cache set;
  * we'll continue to run normally for awhile with CACHE_SET_STOPPING set (i.e.
  * flushing dirty data).
+ *
+ * CACHE_SET_RUNNING means all cache devices have been registered and journal
+ * replay is complete.
  */
 #define CACHE_SET_UNREGISTERING         0
 #define CACHE_SET_STOPPING              1
+#define CACHE_SET_RUNNING               2
 
 struct cache_set {
         struct closure          cl;
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index 545416415305..646fe85261c1 100644
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -1182,7 +1182,7 @@ static void __btree_sort(struct btree_keys *b, struct btree_iter *iter,
 {
         uint64_t start_time;
         bool used_mempool = false;
-        struct bset *out = (void *) __get_free_pages(__GFP_NOWARN|GFP_NOIO,
+        struct bset *out = (void *) __get_free_pages(__GFP_NOWARN|GFP_NOWAIT,
                                                      order);
         if (!out) {
                 struct page *outp;
diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h
index 5f6728d5d4dd..ae964624efb2 100644
--- a/drivers/md/bcache/bset.h
+++ b/drivers/md/bcache/bset.h
@@ -453,7 +453,7 @@ static inline bool bch_bkey_equal_header(const struct bkey *l,
 {
         return (KEY_DIRTY(l) == KEY_DIRTY(r) &&
                 KEY_PTRS(l) == KEY_PTRS(r) &&
-                KEY_CSUM(l) == KEY_CSUM(l));
+                KEY_CSUM(l) == KEY_CSUM(r));
 }
 
 /* Keylists */
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 7347b6100961..00cde40db572 100644
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -117,9 +117,9 @@
 ({                                                                      \
         int _r, l = (b)->level - 1;                                     \
         bool _w = l <= (op)->lock;                                      \
-        struct btree *_child = bch_btree_node_get((b)->c, op, key, l, _w);\
+        struct btree *_child = bch_btree_node_get((b)->c, op, key, l,   \
+                                                  _w, b);               \
         if (!IS_ERR(_child)) {                                          \
-                _child->parent = (b);                                   \
                 _r = bch_btree_ ## fn(_child, op, ##__VA_ARGS__);       \
                 rw_unlock(_w, _child);                                  \
         } else                                                          \
@@ -142,7 +142,6 @@
                 rw_lock(_w, _b, _b->level);                             \
                 if (_b == (c)->root &&                                  \
                     _w == insert_lock(op, _b)) {                        \
-                        _b->parent = NULL;                              \
                         _r = bch_btree_ ## fn(_b, op, ##__VA_ARGS__);   \
                 }                                                       \
                 rw_unlock(_w, _b);                                      \
@@ -202,7 +201,7 @@ void bch_btree_node_read_done(struct btree *b)
         struct bset *i = btree_bset_first(b);
         struct btree_iter *iter;
 
-        iter = mempool_alloc(b->c->fill_iter, GFP_NOWAIT);
+        iter = mempool_alloc(b->c->fill_iter, GFP_NOIO);
         iter->size = b->c->sb.bucket_size / b->c->sb.block_size;
         iter->used = 0;
 
@@ -421,7 +420,7 @@ static void do_btree_node_write(struct btree *b)
         SET_PTR_OFFSET(&k.key, 0, PTR_OFFSET(&k.key, 0) +
                        bset_sector_offset(&b->keys, i));
 
-        if (!bio_alloc_pages(b->bio, GFP_NOIO)) {
+        if (!bio_alloc_pages(b->bio, __GFP_NOWARN|GFP_NOWAIT)) {
                 int j;
                 struct bio_vec *bv;
                 void *base = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));
@@ -967,7 +966,8 @@ err:
  * level and op->lock.
  */
 struct btree *bch_btree_node_get(struct cache_set *c, struct btree_op *op,
-                                 struct bkey *k, int level, bool write)
+                                 struct bkey *k, int level, bool write,
+                                 struct btree *parent)
 {
         int i = 0;
         struct btree *b;
@@ -1002,6 +1002,7 @@ retry:
                 BUG_ON(b->level != level);
         }
 
+        b->parent = parent;
         b->accessed = 1;
 
         for (; i <= b->keys.nsets && b->keys.set[i].size; i++) {
@@ -1022,15 +1023,16 @@ retry:
         return b;
 }
 
-static void btree_node_prefetch(struct cache_set *c, struct bkey *k, int level)
+static void btree_node_prefetch(struct btree *parent, struct bkey *k)
 {
         struct btree *b;
 
-        mutex_lock(&c->bucket_lock);
-        b = mca_alloc(c, NULL, k, level);
-        mutex_unlock(&c->bucket_lock);
+        mutex_lock(&parent->c->bucket_lock);
+        b = mca_alloc(parent->c, NULL, k, parent->level - 1);
+        mutex_unlock(&parent->c->bucket_lock);
 
         if (!IS_ERR_OR_NULL(b)) {
+                b->parent = parent;
                 bch_btree_node_read(b);
                 rw_unlock(true, b);
         }
@@ -1060,15 +1062,16 @@ static void btree_node_free(struct btree *b)
         mutex_unlock(&b->c->bucket_lock);
 }
 
-struct btree *bch_btree_node_alloc(struct cache_set *c, struct btree_op *op,
-                                   int level)
+struct btree *__bch_btree_node_alloc(struct cache_set *c, struct btree_op *op,
+                                     int level, bool wait,
+                                     struct btree *parent)
 {
         BKEY_PADDED(key) k;