Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / cluster / nodemanager.c

diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index af2070da308b87904c468988ba94cae0ee7cf8ae..cf9401e8cd0b221e4187dbd4624c05e2070a3d89 100644 (file)
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -24,7 +24,6 @@
 #include <linux/sysctl.h>
 #include <linux/configfs.h>
 
-#include "endian.h"
 #include "tcp.h"
 #include "nodemanager.h"
 #include "heartbeat.h"
@@ -960,7 +959,10 @@ static int __init init_o2nm(void)
        cluster_print_version();
 
        o2hb_init();
-       o2net_init();
+
+       ret = o2net_init();
+       if (ret)
+               goto out;
 
        ocfs2_table_header = register_sysctl_table(ocfs2_root_table);
        if (!ocfs2_table_header) {