------------------------------------------------------------
revno: 87
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Peter Somogyi <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-04-27 15:54:50 +0200
message:
ctdb/ib: merge-fix: ibw_init called twice
modified:
ib/ibw_ctdb_init.c
ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1
=== modified file 'ib/ibw_ctdb_init.c'
--- a/ib/ibw_ctdb_init.c 2007-04-26 14:54:24 +0000
+++ b/ib/ibw_ctdb_init.c 2007-04-27 13:54:50 +0000
@@ -74,12 +74,7 @@
*/
static int ctdb_ibw_start(struct ctdb_context *ctdb)
{
- int i, ret;
-
- ret = ctdb_ibw_init(ctdb);
- if (ret != 0) {
- return ret;
- }
+ int i;
for (i=0; i<ctdb->num_nodes; i++) {
if (ctdb_ibw_add_node(ctdb->nodes[i]) != 0) {
