"fs checkservers" during cache creation can crash client

[openafs.git] / src / afs / afs_call.c

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 8ed5f48..8c7f75a 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -115,7 +115,7 @@ afs_InitSetup(int preallocs)
     rx_extraPackets = AFS_NRXPACKETS;  /* smaller # of packets */
     code = rx_InitHost(rx_bindhost, htons(7001));
     if (code) {
-       printf("AFS: RX failed to initialize %d).\n", code);
+       afs_warn("AFS: RX failed to initialize %d).\n", code);
        return code;
     }
     rx_SetRxDeadTime(afs_rx_deadtime);
@@ -161,16 +161,7 @@ afsd_thread(int *rock)
        thread_terminate(current_thread());
        break;
     case AFSOP_START_BKG:
-       AFS_GLOCK();
-       wakeup(arg);
-       while (afs_initState < AFSOP_START_BKG)
-           afs_osi_Sleep(&afs_initState);
-       if (afs_initState < AFSOP_GO) {
-           afs_initState = AFSOP_GO;
-           afs_osi_Wakeup(&afs_initState);
-       }
-       afs_BackgroundDaemon();
-       AFS_GUNLOCK();
+       afs_warn("Install matching afsd! Old background daemons not supported.\n");
        thread_terminate(current_thread());
        break;
     case AFSOP_START_TRUNCDAEMON:
@@ -211,7 +202,7 @@ afsd_thread(int *rock)
        thread_terminate(current_thread());
        break;
     default:
-       printf("Unknown op %ld in StartDaemon()\n", (long)parm);
+       afs_warn("Unknown op %ld in StartDaemon()\n", (long)parm);
        break;
     }
 }
@@ -255,7 +246,7 @@ afs_DaemonOp(long parm, long parm2, long parm3, long parm4, long parm5,
 #endif
 
 
-#if defined(AFS_LINUX24_ENV) && defined(COMPLETION_H_EXISTS)
+#if defined(AFS_LINUX24_ENV) && defined(HAVE_LINUX_COMPLETION_H)
 struct afsd_thread_info {
 #if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA)
     struct work_struct tq;
@@ -385,7 +376,7 @@ afsd_thread(void *rock)
        complete_and_exit(0, 0);
        break;
     default:
-       printf("Unknown op %ld in StartDaemon()\n", (long)parm);
+       afs_warn("Unknown op %ld in StartDaemon()\n", (long)parm);
        break;
     }
     return 0;
@@ -403,7 +394,7 @@ afsd_launcher(void *rock)
 #endif
 
     if (!kernel_thread(afsd_thread, (void *)rock, CLONE_VFORK | SIGCHLD))
-       printf("kernel_thread failed. afs startup will not complete\n");
+       afs_warn("kernel_thread failed. afs startup will not complete\n");
 }
 
 void
@@ -532,7 +523,49 @@ afs_syscall_call(long parm, long parm2, long parm3,
 #ifdef AFS_DARWIN80_ENV
     put_vfs_context();
 #endif
-#if ((defined(AFS_LINUX24_ENV) && defined(COMPLETION_H_EXISTS)) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL)
+#if ((defined(AFS_LINUX24_ENV) && defined(HAVE_LINUX_COMPLETION_H)) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL)
+#if defined(AFS_DARWIN80_ENV)
+    if (parm == AFSOP_BKG_HANDLER) {
+       /* if afs_uspc_param grows this should be checked */
+       struct afs_uspc_param *mvParam = osi_AllocSmallSpace(AFS_SMALLOCSIZ);
+       void *param2;
+       void *param1;
+       int namebufsz;
+
+       AFS_COPYIN(AFSKPTR(parm2), (caddr_t)mvParam,
+                  sizeof(struct afs_uspc_param), code);
+       namebufsz = mvParam->bufSz;
+       param1 = afs_osi_Alloc(namebufsz);
+       param2 = afs_osi_Alloc(namebufsz);
+
+       while (afs_initState < AFSOP_START_BKG)
+           afs_osi_Sleep(&afs_initState);
+       if (afs_initState < AFSOP_GO) {
+           afs_initState = AFSOP_GO;
+           afs_osi_Wakeup(&afs_initState);
+       }
+
+       code = afs_BackgroundDaemon(mvParam, param1, param2);
+
+       if (!code) {
+           mvParam->retval = 0;
+           /* for reqs where pointers are strings: */
+           if (mvParam->reqtype == AFS_USPC_UMV) {
+               /* don't copy out random kernel memory */
+               AFS_COPYOUT(param2, AFSKPTR(parm4),
+                           MIN(namebufsz, strlen((char *)param2)+1), code);
+               AFS_COPYOUT(param1, AFSKPTR(parm3),
+                           MIN(namebufsz, strlen((char *)param1)+1), code);
+           }
+           AFS_COPYOUT((caddr_t)mvParam, AFSKPTR(parm2),
+                      sizeof(struct afs_uspc_param), code);
+       }
+
+       afs_osi_Free(param1, namebufsz);
+       afs_osi_Free(param2, namebufsz);
+       osi_FreeSmallSpace(mvParam);
+    } else
+#endif /* DARWIN80 */
     if (parm < AFSOP_ADDCELL || parm == AFSOP_RXEVENT_DAEMON
        || parm == AFSOP_RXLISTENER_DAEMON) {
        afs_DaemonOp(parm, parm2, parm3, parm4, parm5, parm6);
@@ -618,6 +651,7 @@ afs_syscall_call(long parm, long parm2, long parm3,
        AFS_GUNLOCK();
        exit(CLD_EXITED, 0);
 #endif /* AFS_SGI_ENV */
+#ifndef AFS_DARWIN80_ENV
     } else if (parm == AFSOP_START_BKG) {
        while (afs_initState < AFSOP_START_BKG)
            afs_osi_Sleep(&afs_initState);
@@ -627,17 +661,18 @@ afs_syscall_call(long parm, long parm2, long parm3,
        }
        /* start the bkg daemon */
        afs_osi_Invisible();
-#ifdef AFS_AIX32_ENV
+# ifdef AFS_AIX32_ENV
        if (parm2)
            afs_BioDaemon(parm2);
        else
-#endif /* AFS_AIX32_ENV */
+# endif /* AFS_AIX32_ENV */
            afs_BackgroundDaemon();
        afs_osi_Visible();
-#ifdef AFS_SGI_ENV
+# ifdef AFS_SGI_ENV
        AFS_GUNLOCK();
        exit(CLD_EXITED, 0);
-#endif /* AFS_SGI_ENV */
+# endif /* AFS_SGI_ENV */
+#endif /* ! AFS_DARWIN80_ENV */
     } else if (parm == AFSOP_START_TRUNCDAEMON) {
        while (afs_initState < AFSOP_GO)
            afs_osi_Sleep(&afs_initState);
@@ -782,13 +817,14 @@ afs_syscall_call(long parm, long parm2, long parm3,
         */
        char *cell = osi_AllocSmallSpace(AFS_SMALLOCSIZ);
 
-       code = afs_InitDynroot();
-       if (!code) {
-           AFS_COPYINSTR(AFSKPTR(parm2), cell, AFS_SMALLOCSIZ, &bufferSize, code);
-       }
+       afs_CellInit();
+       AFS_COPYINSTR(AFSKPTR(parm2), cell, AFS_SMALLOCSIZ, &bufferSize, code);
        if (!code)
            afs_SetPrimaryCell(cell);
        osi_FreeSmallSpace(cell);
+       if (!code) {
+           code = afs_InitDynroot();
+       }
     } else if (parm == AFSOP_CACHEINIT) {
        struct afs_cacheParams cparms;
 
@@ -1018,12 +1054,10 @@ afs_syscall_call(long parm, long parm2, long parm3,
        afs_cold_shutdown = 0;
        if (parm2 == 1)
            afs_cold_shutdown = 1;
-#ifndef AFS_DARWIN_ENV
        if (afs_globalVFS != 0) {
            afs_warn("AFS isn't unmounted yet! Call aborted\n");
            code = EACCES;
        } else
-#endif
            afs_shutdown();
     } else if (parm == AFSOP_AFS_VFSMOUNT) {
 #ifdef AFS_HPUX_ENV
@@ -1248,10 +1282,15 @@ afs_shutdown(void)
        afs_osi_Sleep(&afs_termState);
     }
 #endif
-#else
-    afs_termState = AFSOP_STOP_COMPLETE;
 #endif
 
+#ifdef AFS_SUN510_ENV
+    afs_warn("NetIfPoller... ");
+    osi_StopNetIfPoller();
+#endif
+
+    afs_termState = AFSOP_STOP_COMPLETE;
+
 #ifdef AFS_AIX51_ENV
     shutdown_daemons();
 #endif