Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / cluster / nodemanager.c

diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index 357f1d551771201f4b9587186fc01a97809ad06b..9f5ad0f01ce0d885e787003d07c4fa0907139dc0 100644 (file)
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -55,7 +55,7 @@ static ctl_table ocfs2_nm_table[] = {
 
 static ctl_table ocfs2_mod_table[] = {
        {
-               .ctl_name       = KERN_OCFS2_NM,
+               .ctl_name       = FS_OCFS2_NM,
                .procname       = "nm",
                .data           = NULL,
                .maxlen         = 0,
@@ -67,7 +67,7 @@ static ctl_table ocfs2_mod_table[] = {
 
 static ctl_table ocfs2_kern_table[] = {
        {
-               .ctl_name       = KERN_OCFS2,
+               .ctl_name       = FS_OCFS2,
                .procname       = "ocfs2",
                .data           = NULL,
                .maxlen         = 0,
@@ -714,7 +714,7 @@ static struct config_item *o2nm_node_group_make_item(struct config_group *group,
        if (strlen(name) > O2NM_MAX_NAME_LEN)
                goto out; /* ENAMETOOLONG */
 
-       node = kcalloc(1, sizeof(struct o2nm_node), GFP_KERNEL);
+       node = kzalloc(sizeof(struct o2nm_node), GFP_KERNEL);
        if (node == NULL)
                goto out; /* ENOMEM */
 
@@ -825,8 +825,8 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
        if (o2nm_single_cluster)
                goto out; /* ENOSPC */
 
-       cluster = kcalloc(1, sizeof(struct o2nm_cluster), GFP_KERNEL);
-       ns = kcalloc(1, sizeof(struct o2nm_node_group), GFP_KERNEL);
+       cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL);
+       ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL);
        defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL);
        o2hb_group = o2hb_alloc_hb_set();
        if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL)
@@ -922,7 +922,7 @@ static int __init init_o2nm(void)
        o2hb_init();
        o2net_init();
 
-       ocfs2_table_header = register_sysctl_table(ocfs2_root_table, 0);
+       ocfs2_table_header = register_sysctl_table(ocfs2_root_table);
        if (!ocfs2_table_header) {
                printk(KERN_ERR "nodemanager: unable to register sysctl\n");
                ret = -ENOMEM; /* or something. */