bcache: Allocate bounce buffers with GFP_NOWAIT

There's no point in blocking on these allocations, since our fallback paths will
probably go faster than blocking.

Change-Id: I733ca202c25cb36bde02607a0a60552229a4241c

diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index 54541641530569c442f7113b687428fad4bb18d6..646fe85261c17bcfb43ff89b54586838a00c39e7 100644 (file)
--- 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/btree.c b/drivers/md/bcache/btree.c
index e538d45fa65a9c45ec502cebc7e0634d36a6a5d2..39c7f5b73724dc093d30f52768d5c7c3d422d1b1 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -421,7 +421,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));