staging: lustre: llite: Use kcalloc not kzalloc with mult
authorTina Ruchandani <ruchandani.tina@gmail.com>
Wed, 22 Oct 2014 18:29:26 +0000 (11:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Oct 2014 03:09:12 +0000 (11:09 +0800)
This patch fixes the following checkpatch.pl warnings:
WARNING: Prefer kcalloc over kzalloc with multiply
166: FILE: drivers/staging/lustre/lustre/llite/dir.c:166:
page_pool = kzalloc(sizeof(page) * max_pages, GFP_NOFS);
796: FILE: drivers/staging/lustre/lustre/llite/lloop.c:796:
loop_dev = kzalloc(max_loop * sizeof(*loop_dev), GFP_KERNEL);
800: FILE: drivers/staging/lustre/lustre/llite/lloop.c:800:
disks = kzalloc(max_loop * sizeof(*disks), GFP_KERNEL);

Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/llite/dir.c
drivers/staging/lustre/lustre/llite/lloop.c

index 9e8bfdc..a07e0fe 100644 (file)
@@ -163,7 +163,7 @@ static int ll_dir_filler(void *_hash, struct page *page0)
 
        LASSERT(max_pages > 0 && max_pages <= MD_MAX_BRW_PAGES);
 
-       page_pool = kzalloc(sizeof(page) * max_pages, GFP_NOFS);
+       page_pool = kcalloc(max_pages, sizeof(page), GFP_NOFS);
        if (page_pool) {
                page_pool[0] = page0;
        } else {
index 264e5ec..e0f39fe 100644 (file)
@@ -793,11 +793,11 @@ static int __init lloop_init(void)
        if (ll_iocontrol_magic == NULL)
                goto out_mem1;
 
-       loop_dev = kzalloc(max_loop * sizeof(*loop_dev), GFP_KERNEL);
+       loop_dev = kcalloc(max_loop, sizeof(*loop_dev), GFP_KERNEL);
        if (!loop_dev)
                goto out_mem1;
 
-       disks = kzalloc(max_loop * sizeof(*disks), GFP_KERNEL);
+       disks = kcalloc(max_loop, sizeof(*disks), GFP_KERNEL);
        if (!disks)
                goto out_mem2;