Commit c1b511eb authored by Joe Perches's avatar Joe Perches Committed by Jens Axboe

block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)

Use the helper function instead of __GFP_ZERO.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7aef2e78
...@@ -4358,7 +4358,7 @@ static int cfq_init_queue(struct request_queue *q, struct elevator_type *e) ...@@ -4358,7 +4358,7 @@ static int cfq_init_queue(struct request_queue *q, struct elevator_type *e)
if (!eq) if (!eq)
return -ENOMEM; return -ENOMEM;
cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q->node); cfqd = kzalloc_node(sizeof(*cfqd), GFP_KERNEL, q->node);
if (!cfqd) { if (!cfqd) {
kobject_put(&eq->kobj); kobject_put(&eq->kobj);
return -ENOMEM; return -ENOMEM;
......
...@@ -346,7 +346,7 @@ static int deadline_init_queue(struct request_queue *q, struct elevator_type *e) ...@@ -346,7 +346,7 @@ static int deadline_init_queue(struct request_queue *q, struct elevator_type *e)
if (!eq) if (!eq)
return -ENOMEM; return -ENOMEM;
dd = kmalloc_node(sizeof(*dd), GFP_KERNEL | __GFP_ZERO, q->node); dd = kzalloc_node(sizeof(*dd), GFP_KERNEL, q->node);
if (!dd) { if (!dd) {
kobject_put(&eq->kobj); kobject_put(&eq->kobj);
return -ENOMEM; return -ENOMEM;
......
...@@ -155,7 +155,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q, ...@@ -155,7 +155,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,
{ {
struct elevator_queue *eq; struct elevator_queue *eq;
eq = kmalloc_node(sizeof(*eq), GFP_KERNEL | __GFP_ZERO, q->node); eq = kzalloc_node(sizeof(*eq), GFP_KERNEL, q->node);
if (unlikely(!eq)) if (unlikely(!eq))
goto err; goto err;
......
...@@ -1252,8 +1252,7 @@ struct gendisk *alloc_disk_node(int minors, int node_id) ...@@ -1252,8 +1252,7 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
{ {
struct gendisk *disk; struct gendisk *disk;
disk = kmalloc_node(sizeof(struct gendisk), disk = kzalloc_node(sizeof(struct gendisk), GFP_KERNEL, node_id);
GFP_KERNEL | __GFP_ZERO, node_id);
if (disk) { if (disk) {
if (!init_part_stats(&disk->part0)) { if (!init_part_stats(&disk->part0)) {
kfree(disk); kfree(disk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment