aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-mq.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index b7b8933ec241..33c428530193 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1457,7 +1457,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
1457 1457
1458 do { 1458 do {
1459 page = alloc_pages_node(set->numa_node, 1459 page = alloc_pages_node(set->numa_node,
1460 GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY, 1460 GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO,
1461 this_order); 1461 this_order);
1462 if (page) 1462 if (page)
1463 break; 1463 break;
@@ -1479,8 +1479,6 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
1479 left -= to_do * rq_size; 1479 left -= to_do * rq_size;
1480 for (j = 0; j < to_do; j++) { 1480 for (j = 0; j < to_do; j++) {
1481 tags->rqs[i] = p; 1481 tags->rqs[i] = p;
1482 tags->rqs[i]->atomic_flags = 0;
1483 tags->rqs[i]->cmd_flags = 0;
1484 if (set->ops->init_request) { 1482 if (set->ops->init_request) {
1485 if (set->ops->init_request(set->driver_data, 1483 if (set->ops->init_request(set->driver_data,
1486 tags->rqs[i], hctx_idx, i, 1484 tags->rqs[i], hctx_idx, i,