summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2014-05-19 08:57:55 -0700
committerKent Overstreet <kmo@daterainc.com>2014-08-04 15:23:03 -0700
commitbcf090e0040e30f8409e6a535a01e6473afb096f (patch)
tree783c32e0c6bb06933e92150585a6faa13c9d1261 /drivers/md
parent9e5c353510b26500bd6b8309823ac9ef2837b761 (diff)
downloadlinux-bcf090e0040e30f8409e6a535a01e6473afb096f.tar.gz
linux-bcf090e0040e30f8409e6a535a01e6473afb096f.tar.bz2
linux-bcf090e0040e30f8409e6a535a01e6473afb096f.zip
bcache: Make sure to pass GFP_WAIT to mempool_alloc()
this was very wrong - mempool_alloc() only guarantees success with GFP_WAIT. bcache uses GFP_NOWAIT in various other places where we have a fallback, circuits must've gotten crossed when writing this code or something. Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/bcache/btree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 9dd9f1c4d0d9..e538d45fa65a 100644
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -202,7 +202,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;