Commit 501d52a9 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

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
parent bcf090e0

drivers/md/bcache/bset.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/md/bcache/btree.c

+1 −1
Original line number Diff line number Diff line
@@ -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));