瀏覽代碼

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
Kent Overstreet 11 年之前
父節點
當前提交
501d52a90c
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/md/bcache/bset.c
  2. 1 1
      drivers/md/bcache/btree.c

+ 1 - 1
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;
 	uint64_t start_time;
 	bool used_mempool = false;
 	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);
 						     order);
 	if (!out) {
 	if (!out) {
 		struct page *outp;
 		struct page *outp;

+ 1 - 1
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) +
 	SET_PTR_OFFSET(&k.key, 0, PTR_OFFSET(&k.key, 0) +
 		       bset_sector_offset(&b->keys, i));
 		       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;
 		int j;
 		struct bio_vec *bv;
 		struct bio_vec *bv;
 		void *base = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));
 		void *base = (void *) ((unsigned long) i & ~(PAGE_SIZE - 1));