Slab allocators: Replace explicit zeroing with __GFP_ZERO

kmalloc_node() and kmem_cache_alloc_node() were not available in a zeroing
variant in the past.  But with __GFP_ZERO it is possible now to do zeroing
while allocating.

Use __GFP_ZERO to remove the explicit clearing of memory via memset whereever
we can.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/block/genhd.c b/block/genhd.c
index 863a8c0623ed..b321cadd6e65 100644
--- 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);