Slab allocators: Replace explicit zeroing with __GFP_ZERO

[sfrench/cifs-2.6.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 863a8c0623ed824e27d85f32a52cf10ea39d1c02..b321cadd6e65b5d543aed766ccdc09cad0be7eb0 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -726,21 +726,21 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
 {
        struct gendisk *disk;
 
-       disk = kmalloc_node(sizeof(struct gendisk), GFP_KERNEL, node_id);
+       disk = kmalloc_node(sizeof(struct gendisk),
+                               GFP_KERNEL | __GFP_ZERO, node_id);
        if (disk) {
-               memset(disk, 0, sizeof(struct gendisk));
                if (!init_disk_stats(disk)) {
                        kfree(disk);
                        return NULL;
                }
                if (minors > 1) {
                        int size = (minors - 1) * sizeof(struct hd_struct *);
-                       disk->part = kmalloc_node(size, GFP_KERNEL, node_id);
+                       disk->part = kmalloc_node(size,
+                               GFP_KERNEL | __GFP_ZERO, node_id);
                        if (!disk->part) {
                                kfree(disk);
                                return NULL;
                        }
-                       memset(disk->part, 0, size);
                }
                disk->minors = minors;
                kobj_set_kset_s(disk,block_subsys);