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, 9 insertions, 9 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index e0aa4dad6742..9755a3cfad26 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1251,9 +1251,9 @@ cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
 {
         struct cfq_io_context *cic;
 
-        cic = kmem_cache_alloc_node(cfq_ioc_pool, gfp_mask, cfqd->queue->node);
+        cic = kmem_cache_alloc_node(cfq_ioc_pool, gfp_mask | __GFP_ZERO,
+                                                        cfqd->queue->node);
         if (cic) {
-                memset(cic, 0, sizeof(*cic));
                 cic->last_end_request = jiffies;
                 INIT_LIST_HEAD(&cic->queue_list);
                 cic->dtor = cfq_free_io_context;
@@ -1376,17 +1376,19 @@ retry:
                          * free memory.
                          */
                         spin_unlock_irq(cfqd->queue->queue_lock);
-                        new_cfqq = kmem_cache_alloc_node(cfq_pool, gfp_mask|__GFP_NOFAIL, cfqd->queue->node);
+                        new_cfqq = kmem_cache_alloc_node(cfq_pool,
+                                        gfp_mask | __GFP_NOFAIL | __GFP_ZERO,
+                                        cfqd->queue->node);
                         spin_lock_irq(cfqd->queue->queue_lock);
                         goto retry;
                 } else {
-                        cfqq = kmem_cache_alloc_node(cfq_pool, gfp_mask, cfqd->queue->node);
+                        cfqq = kmem_cache_alloc_node(cfq_pool,
+                                        gfp_mask | __GFP_ZERO,
+                                        cfqd->queue->node);
                         if (!cfqq)
                                 goto out;
                 }
 
-                memset(cfqq, 0, sizeof(*cfqq));
-
                 RB_CLEAR_NODE(&cfqq->rb_node);
                 INIT_LIST_HEAD(&cfqq->fifo);
 
@@ -2079,12 +2081,10 @@ static void *cfq_init_queue(request_queue_t *q)
 {
         struct cfq_data *cfqd;
 
-        cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL, q->node);
+        cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q->node);
         if (!cfqd)
                 return NULL;
 
-        memset(cfqd, 0, sizeof(*cfqd));
-
         cfqd->service_tree = CFQ_RB_ROOT;
         INIT_LIST_HEAD(&cfqd->cic_list);