summaryrefslogtreecommitdiff
path: root/fs/ocfs2/cluster/nodemanager.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2006-02-22 03:54:00 +0300
committerMark Fasheh <mark.fasheh@oracle.com>2006-03-01 22:29:30 +0300
commit895928b8380cc697ac56e9732cedf549c0a4f79c (patch)
tree472589e737ff7c3221fee149d7ef4bb11e823a90 /fs/ocfs2/cluster/nodemanager.c
parent362342f68e331f080d0438f08af1e2c570b0b5fe (diff)
downloadlinux-895928b8380cc697ac56e9732cedf549c0a4f79c.tar.xz
[PATCH] ocfs2: complete failure recovery for nodemanager init
This patch finishes cleaning up the node manager allocations if it fails to initialize. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/cluster/nodemanager.c')
-rw-r--r--fs/ocfs2/cluster/nodemanager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index cf7828f23361..e1fceb8aa32d 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -756,7 +756,7 @@ static int __init init_o2nm(void)
if (!ocfs2_table_header) {
printk(KERN_ERR "nodemanager: unable to register sysctl\n");
ret = -ENOMEM; /* or something. */
- goto out;
+ goto out_o2net;
}
ret = o2net_register_hb_callbacks();
@@ -780,6 +780,8 @@ out_callbacks:
o2net_unregister_hb_callbacks();
out_sysctl:
unregister_sysctl_table(ocfs2_table_header);
+out_o2net:
+ o2net_exit();
out:
return ret;
}