From 3c1b170d71737573f7415acc2307c100bd8a974b Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sun, 23 Mar 2003 19:47:53 +0000 Subject: [PATCH] STABLE12-move-up-cell-initialization-in-cachemgr-20030323 to potentially avoid an oops at startup (cherry picked from commit 3fa5f389b2b7778cf0df5a506c91b427b147c4c2) --- src/afs/afs_call.c | 4 +++- src/afsd/afsd.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 34905402cc..ad47c04d1c 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -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) { diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index 7d9aa5c964..5afd464b07 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -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. */