diff options
| -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 d79fdc11b1ee..7ad7c11fe01d 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
| @@ -1605,7 +1605,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, | |||
| 1605 | INIT_LIST_HEAD(&tags->page_list); | 1605 | INIT_LIST_HEAD(&tags->page_list); |
| 1606 | 1606 | ||
| 1607 | tags->rqs = kzalloc_node(set->queue_depth * sizeof(struct request *), | 1607 | tags->rqs = kzalloc_node(set->queue_depth * sizeof(struct request *), |
| 1608 | GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY, | 1608 | GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, |
| 1609 | set->numa_node); | 1609 | set->numa_node); |
| 1610 | if (!tags->rqs) { | 1610 | if (!tags->rqs) { |
| 1611 | blk_mq_free_tags(tags); | 1611 | blk_mq_free_tags(tags); |
| @@ -1631,7 +1631,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, | |||
| 1631 | 1631 | ||
| 1632 | do { | 1632 | do { |
| 1633 | page = alloc_pages_node(set->numa_node, | 1633 | page = alloc_pages_node(set->numa_node, |
| 1634 | GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO, | 1634 | GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO, |
| 1635 | this_order); | 1635 | this_order); |
| 1636 | if (page) | 1636 | if (page) |
| 1637 | break; | 1637 | break; |
| @@ -1652,7 +1652,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, | |||
| 1652 | * Allow kmemleak to scan these pages as they contain pointers | 1652 | * Allow kmemleak to scan these pages as they contain pointers |
| 1653 | * to additional allocations like via ops->init_request(). | 1653 | * to additional allocations like via ops->init_request(). |
| 1654 | */ | 1654 | */ |
| 1655 | kmemleak_alloc(p, order_to_size(this_order), 1, GFP_KERNEL); | 1655 | kmemleak_alloc(p, order_to_size(this_order), 1, GFP_NOIO); |
| 1656 | entries_per_page = order_to_size(this_order) / rq_size; | 1656 | entries_per_page = order_to_size(this_order) / rq_size; |
| 1657 | to_do = min(entries_per_page, set->queue_depth - i); | 1657 | to_do = min(entries_per_page, set->queue_depth - i); |
| 1658 | left -= to_do * rq_size; | 1658 | left -= to_do * rq_size; |
