1 files changed, 5 insertions, 14 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 443d108211ab..7dce1612553e 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1489,31 +1489,22 @@ static struct o2hb_heartbeat_group *to_o2hb_heartbeat_group(struct config_group
                : NULL;
 }
-static int o2hb_heartbeat_group_make_item(struct config_group *group,
+static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *group,
-                                          const char *name,
+                                                          const char *name)
-                                          struct config_item **new_item)
 {
        struct o2hb_region *reg = NULL;
-        int ret = 0;
        reg = kzalloc(sizeof(struct o2hb_region), GFP_KERNEL);
-        if (reg == NULL) {
+        if (reg == NULL)
-                ret = -ENOMEM;
+                return ERR_PTR(-ENOMEM);
-                goto out;
-        }
        config_item_init_type_name(&reg->hr_item, name, &o2hb_region_type);
-        *new_item = &reg->hr_item;
        spin_lock(&o2hb_live_lock);
        list_add_tail(&reg->hr_all_item, &o2hb_all_regions);
        spin_unlock(&o2hb_live_lock);
-out:
-        if (ret)
-                kfree(reg);
-        return ret;
+        return &reg->hr_item;
 }
 static void o2hb_heartbeat_group_drop_item(struct config_group *group,