diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-05-08 15:22:52 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-05-08 15:22:52 -0400 |
| commit | c69b690f8ffa1d0095d842e9b3725109e81986b5 (patch) | |
| tree | a5e7dd05ab6f0450db2dbd57d4d985148bea711e /block | |
| parent | 955fdaf9410c302284ba389b61f30e2feafe8a54 (diff) | |
| parent | a80c068fbf43e22f099c0587b9e1a2337378a505 (diff) | |
Merge tag 'v4.4.62' into v4.4-rt
This is the 4.4.62 stable release
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index de4a35cb92d4..e4fc80184dd8 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1490,7 +1490,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, INIT_LIST_HEAD(&tags->page_list); tags->rqs = kzalloc_node(set->queue_depth * sizeof(struct request *), - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY, + GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, set->numa_node); if (!tags->rqs) { blk_mq_free_tags(tags); @@ -1516,7 +1516,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, do { page = alloc_pages_node(set->numa_node, - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO, + GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO, this_order); if (page) break; @@ -1537,7 +1537,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, * Allow kmemleak to scan these pages as they contain pointers * to additional allocations like via ops->init_request(). */ - kmemleak_alloc(p, order_to_size(this_order), 1, GFP_KERNEL); + kmemleak_alloc(p, order_to_size(this_order), 1, GFP_NOIO); entries_per_page = order_to_size(this_order) / rq_size; to_do = min(entries_per_page, set->queue_depth - i); left -= to_do * rq_size; |