diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2014-05-19 17:55:40 +0200 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2014-08-05 00:23:03 +0200 |
| commit | 501d52a90cbe652b41336c206ff0e95799d5a9b5 (patch) | |
| tree | 84c394218e0180934467c678c63b92414463f2ab /drivers/md | |
| parent | bcache: Make sure to pass GFP_WAIT to mempool_alloc() (diff) | |
| download | linux-501d52a90cbe652b41336c206ff0e95799d5a9b5.tar.xz linux-501d52a90cbe652b41336c206ff0e95799d5a9b5.zip | |
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
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/bcache/bset.c | 2 | ||||
| -rw-r--r-- | drivers/md/bcache/btree.c | 2 |
2 files changed, 2 insertions, 2 deletions
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/btree.c b/drivers/md/bcache/btree.c index e538d45fa65a..39c7f5b73724 100644 --- 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)); |