2 files changed, 7 insertions, 19 deletions

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index f02ccb34604d..7dce1612553e 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1493,24 +1493,18 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
                                                           const char *name)
 {
         struct o2hb_region *reg = NULL;
-        struct config_item *ret = NULL;
 
         reg = kzalloc(sizeof(struct o2hb_region), GFP_KERNEL);
         if (reg == NULL)
-                goto out; /* ENOMEM */
+                return ERR_PTR(-ENOMEM);
 
         config_item_init_type_name(&reg->hr_item, name, &o2hb_region_type);
 
-        ret = &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 == NULL)
-                kfree(reg);
 
-        return ret;
+        return &reg->hr_item;
 }
 
 static void o2hb_heartbeat_group_drop_item(struct config_group *group,
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index cfdb08b484ed..816a3f61330c 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -648,26 +648,19 @@ static struct config_item *o2nm_node_group_make_item(struct config_group *group,
                                                      const char *name)
 {
         struct o2nm_node *node = NULL;
-        struct config_item *ret = NULL;
 
         if (strlen(name) > O2NM_MAX_NAME_LEN)
-                goto out; /* ENAMETOOLONG */
+                return ERR_PTR(-ENAMETOOLONG);
 
         node = kzalloc(sizeof(struct o2nm_node), GFP_KERNEL);
         if (node == NULL)
-                goto out; /* ENOMEM */
+                return ERR_PTR(-ENOMEM);
 
         strcpy(node->nd_name, name); /* use item.ci_namebuf instead? */
         config_item_init_type_name(&node->nd_item, name, &o2nm_node_type);
         spin_lock_init(&node->nd_lock);
 
-        ret = &node->nd_item;
-
-out:
-        if (ret == NULL)
-                kfree(node);
-
-        return ret;
+        return &node->nd_item;
 }
 
 static void o2nm_node_group_drop_item(struct config_group *group,
@@ -762,7 +755,7 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
         /* this runs under the parent dir's i_mutex; there can be only
          * one caller in here at a time */
         if (o2nm_single_cluster)
-                goto out; /* ENOSPC */
+                return ERR_PTR(-ENOSPC);
 
         cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL);
         ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL);
@@ -795,6 +788,7 @@ out:
                 kfree(ns);
                 o2hb_free_hb_set(o2hb_group);
                 kfree(defs);
+                ret = ERR_PTR(-ENOMEM);
         }
 
         return ret;