Skip to content

Commit c1b511e

Browse files
JoePerchesaxboe
authored andcommitted
block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
Use the helper function instead of __GFP_ZERO. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 7aef2e7 commit c1b511e

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

block/cfq-iosched.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4358,7 +4358,7 @@ static int cfq_init_queue(struct request_queue *q, struct elevator_type *e)
43584358
if (!eq)
43594359
return -ENOMEM;
43604360

4361-
cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q->node);
4361+
cfqd = kzalloc_node(sizeof(*cfqd), GFP_KERNEL, q->node);
43624362
if (!cfqd) {
43634363
kobject_put(&eq->kobj);
43644364
return -ENOMEM;

block/deadline-iosched.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ static int deadline_init_queue(struct request_queue *q, struct elevator_type *e)
346346
if (!eq)
347347
return -ENOMEM;
348348

349-
dd = kmalloc_node(sizeof(*dd), GFP_KERNEL | __GFP_ZERO, q->node);
349+
dd = kzalloc_node(sizeof(*dd), GFP_KERNEL, q->node);
350350
if (!dd) {
351351
kobject_put(&eq->kobj);
352352
return -ENOMEM;

block/elevator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,
155155
{
156156
struct elevator_queue *eq;
157157

158-
eq = kmalloc_node(sizeof(*eq), GFP_KERNEL | __GFP_ZERO, q->node);
158+
eq = kzalloc_node(sizeof(*eq), GFP_KERNEL, q->node);
159159
if (unlikely(!eq))
160160
goto err;
161161

block/genhd.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,8 +1252,7 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
12521252
{
12531253
struct gendisk *disk;
12541254

1255-
disk = kmalloc_node(sizeof(struct gendisk),
1256-
GFP_KERNEL | __GFP_ZERO, node_id);
1255+
disk = kzalloc_node(sizeof(struct gendisk), GFP_KERNEL, node_id);
12571256
if (disk) {
12581257
if (!init_part_stats(&disk->part0)) {
12591258
kfree(disk);

0 commit comments

Comments
 (0)