From 7caf4143e2e2b05c074399dff5ea28ffb16fb29d Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Wed, 19 Jan 2011 21:57:58 -0500 Subject: [PATCH] ubik: Rearrange some initialization code Some basic initialization should precede creating the RX services. Change-Id: Ic88d639be12ee8edd2ec7b61c2a5df435b59f663 Reviewed-on: http://gerrit.openafs.org/4144 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Reviewed-by: Derrick Brashear --- src/ubik/ubik.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index ca74579cbb..c91ce7d73a 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -423,6 +423,19 @@ ubik_ServerInitCommon(afs_uint32 myHost, short myPort, udisk_Init(ubik_nBuffers); ulock_Init(); + code = uvote_Init(); + if (code) + return code; + code = urecovery_Initialize(tdb); + if (code) + return code; + if (info) + code = ubeacon_InitServerListByInfo(myHost, info, clones); + else + code = ubeacon_InitServerList(myHost, serverList); + if (code) + return code; + ubik_callPortal = myPort; /* try to get an additional security object */ ubik_sc[0] = rxnull_NewServerSecurityObject(); @@ -486,20 +499,6 @@ ubik_ServerInitCommon(afs_uint32 myHost, short myPort, NULL, "rx_ServerProc", &junk); #endif - /* do basic initialization */ - code = uvote_Init(); - if (code) - return code; - code = urecovery_Initialize(tdb); - if (code) - return code; - if (info) - code = ubeacon_InitServerListByInfo(myHost, info, clones); - else - code = ubeacon_InitServerList(myHost, serverList); - if (code) - return code; - /* now start up async processes */ #ifdef AFS_PTHREAD_ENV /* do assert stuff */