diff options
Diffstat (limited to 'fs/ocfs2/cluster/tcp.c')
-rw-r--r-- | fs/ocfs2/cluster/tcp.c | 10 |
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) | |||
324 | struct page *page = NULL; | 324 | struct page *page = NULL; |
325 | 325 | ||
326 | page = alloc_page(GFP_NOFS); | 326 | page = alloc_page(GFP_NOFS); |
327 | sc = kcalloc(1, sizeof(*sc), GFP_NOFS); | 327 | sc = kzalloc(sizeof(*sc), GFP_NOFS); |
328 | if (sc == NULL || page == NULL) | 328 | if (sc == NULL || page == NULL) |
329 | goto out; | 329 | goto out; |
330 | 330 | ||
@@ -714,7 +714,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len, | |||
714 | goto out; | 714 | goto out; |
715 | } | 715 | } |
716 | 716 | ||
717 | nmh = kcalloc(1, sizeof(struct o2net_msg_handler), GFP_NOFS); | 717 | nmh = kzalloc(sizeof(struct o2net_msg_handler), GFP_NOFS); |
718 | if (nmh == NULL) { | 718 | if (nmh == NULL) { |
719 | ret = -ENOMEM; | 719 | ret = -ENOMEM; |
720 | goto out; | 720 | goto out; |
@@ -1918,9 +1918,9 @@ int o2net_init(void) | |||
1918 | 1918 | ||
1919 | o2quo_init(); | 1919 | o2quo_init(); |
1920 | 1920 | ||
1921 | o2net_hand = kcalloc(1, sizeof(struct o2net_handshake), GFP_KERNEL); | 1921 | o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL); |
1922 | o2net_keep_req = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL); | 1922 | o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); |
1923 | o2net_keep_resp = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL); | 1923 | o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); |
1924 | if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) { | 1924 | if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) { |
1925 | kfree(o2net_hand); | 1925 | kfree(o2net_hand); |
1926 | kfree(o2net_keep_req); | 1926 | kfree(o2net_keep_req); |