Merge ../linux-2.6-watchdog-mm

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / cluster / tcp.c

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 457753df1ae76719933463a268e7fd44a7dd9fc1..ae4ff4a6636b23759522994898a95c148a4401f1 100644 (file)
--- 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);