[PATCH] Fix numerous kcalloc() calls, convert to kzalloc()

All kcalloc() calls of the form "kcalloc(1,...)" are converted to the
equivalent kzalloc() calls, and a few kcalloc() calls with the incorrect
ordering of the first two arguments are fixed.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 457753df1ae7..ae4ff4a6636b 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -324,7 +324,7 @@ static struct o2net_sock_container *sc_alloc(struct o2nm_node *node)
         struct page *page = NULL;
 
         page = alloc_page(GFP_NOFS);
-        sc = kcalloc(1, sizeof(*sc), GFP_NOFS);
+        sc = kzalloc(sizeof(*sc), GFP_NOFS);
         if (sc == NULL || page == NULL)
                 goto out;
 
@@ -714,7 +714,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len,
                 goto out;
         }
 
-        nmh = kcalloc(1, sizeof(struct o2net_msg_handler), GFP_NOFS);
+        nmh = kzalloc(sizeof(struct o2net_msg_handler), GFP_NOFS);
         if (nmh == NULL) {
                 ret = -ENOMEM;
                 goto out;
@@ -1918,9 +1918,9 @@ int o2net_init(void)
 
         o2quo_init();
 
-        o2net_hand = kcalloc(1, sizeof(struct o2net_handshake), GFP_KERNEL);
-        o2net_keep_req = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
-        o2net_keep_resp = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
+        o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL);
+        o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
+        o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
         if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) {
                 kfree(o2net_hand);
                 kfree(o2net_keep_req);