STABLE12-move-up-cell-initialization-in-cachemgr-20030323

to potentially avoid an oops at startup


(cherry picked from commit 3fa5f389b2)
This commit is contained in:
Derrick Brashear 2003-03-23 19:47:53 +00:00
parent de88f3af92
commit 3c1b170d71
2 changed files with 14 additions and 12 deletions

View File

@ -497,8 +497,10 @@ long parm, parm2, parm3, parm4, parm5, parm6;
char *tbuffer1 = osi_AllocSmallSpace(AFS_SMALLOCSIZ), *cnamep = 0;
int cflags = parm4;
/* wait for basic init */
#if 0
/* wait for basic init - XXX can't find any reason we need this? */
while (afs_initState < AFSOP_START_BKG) afs_osi_Sleep(&afs_initState);
#endif
AFS_COPYIN((char *)parm2, (char *)tcell.hosts, sizeof(tcell.hosts), code);
if (!code) {

View File

@ -1668,6 +1668,17 @@ mainproc(as, arock)
printf("%s: Error enabling fakestat support.\n", rn);
}
/*
* Tell the kernel about each cell in the configuration.
*/
afsconf_CellApply(cdir, ConfigCell, NULL);
afsconf_CellAliasApply(cdir, ConfigCellAlias, NULL);
/*
* Set the primary cell name.
*/
call_syscall(AFSOP_SET_THISCELL, LclCellName);
/* Initialize AFS daemon threads. */
if (afsd_verbose)
printf("%s: Forking AFS daemon.\n", rn);
@ -1723,17 +1734,6 @@ mainproc(as, arock)
}
#endif
/*
* Tell the kernel about each cell in the configuration.
*/
afsconf_CellApply(cdir, ConfigCell, (char *) 0);
afsconf_CellAliasApply(cdir, ConfigCellAlias, (char *) 0);
/*
* Set the primary cell name.
*/
call_syscall(AFSOP_SET_THISCELL, LclCellName);
/*
* If the root volume has been explicitly set, tell the kernel.
*/