Index: openafs/src/WINNT/afsd/NTMakefile diff -c openafs/src/WINNT/afsd/NTMakefile:1.46.2.4 openafs/src/WINNT/afsd/NTMakefile:1.46.2.5 *** openafs/src/WINNT/afsd/NTMakefile:1.46.2.4 Thu Aug 31 06:29:48 2006 --- openafs/src/WINNT/afsd/NTMakefile Thu Jul 5 15:22:15 2007 *************** *** 52,57 **** --- 52,58 ---- $(INCFILEDIR)\cm_callback.h \ $(INCFILEDIR)\cm_aclent.h \ $(INCFILEDIR)\cm_volume.h \ + $(INCFILEDIR)\cm_volstat.h \ $(INCFILEDIR)\cm_dcache.h \ $(INCFILEDIR)\cm_access.h \ $(INCFILEDIR)\cm_vnodeops.h \ *************** *** 101,106 **** --- 102,108 ---- $(OUT)\cm_cell.obj \ $(OUT)\cm_server.obj \ $(OUT)\cm_volume.obj \ + $(OUT)\cm_volstat.obj \ $(OUT)\cm_config.obj \ $(OUT)\cm_conn.obj \ $(OUT)\cm_user.obj \ Index: openafs/src/WINNT/afsd/afsd.h diff -c openafs/src/WINNT/afsd/afsd.h:1.18.2.1 openafs/src/WINNT/afsd/afsd.h:1.18.2.3 *** openafs/src/WINNT/afsd/afsd.h:1.18.2.1 Mon Feb 26 20:32:09 2007 --- openafs/src/WINNT/afsd/afsd.h Thu Jul 5 15:22:15 2007 *************** *** 40,49 **** #endif /* DISKCACHE95 */ #include "cm_conn.h" #include "cm_aclent.h" - #include "cm_cell.h" #include "cm_server.h" #include "cm_scache.h" #include "cm_volume.h" #include "cm_dcache.h" #include "cm_access.h" #include "cm_utils.h" --- 40,50 ---- #endif /* DISKCACHE95 */ #include "cm_conn.h" #include "cm_aclent.h" #include "cm_server.h" + #include "cm_cell.h" #include "cm_scache.h" #include "cm_volume.h" + #include "cm_volstat.h" #include "cm_dcache.h" #include "cm_access.h" #include "cm_utils.h" Index: openafs/src/WINNT/afsd/afsd_init.c diff -c openafs/src/WINNT/afsd/afsd_init.c:1.79.2.12 openafs/src/WINNT/afsd/afsd_init.c:1.79.2.14 *** openafs/src/WINNT/afsd/afsd_init.c:1.79.2.12 Mon Apr 16 20:06:25 2007 --- openafs/src/WINNT/afsd/afsd_init.c Fri Jun 22 10:12:39 2007 *************** *** 997,1044 **** afsi_log("RX Process Statistics gathering is enabled"); dummyLen = sizeof(DWORD); - code = RegQueryValueEx(parmKey, "daemonCheckDownInterval", NULL, NULL, - (BYTE *) &dwValue, &dummyLen); - if (code == ERROR_SUCCESS) - cm_daemonCheckDownInterval = dwValue; - afsi_log("daemonCheckDownInterval is %d", cm_daemonCheckDownInterval); - - dummyLen = sizeof(DWORD); - code = RegQueryValueEx(parmKey, "daemonCheckUpInterval", NULL, NULL, - (BYTE *) &dwValue, &dummyLen); - if (code == ERROR_SUCCESS) - cm_daemonCheckUpInterval = dwValue; - afsi_log("daemonCheckUpInterval is %d", cm_daemonCheckUpInterval); - - dummyLen = sizeof(DWORD); - code = RegQueryValueEx(parmKey, "daemonCheckVolInterval", NULL, NULL, - (BYTE *) &dwValue, &dummyLen); - if (code == ERROR_SUCCESS) - cm_daemonCheckVolInterval = dwValue; - afsi_log("daemonCheckVolInterval is %d", cm_daemonCheckVolInterval); - - dummyLen = sizeof(DWORD); - code = RegQueryValueEx(parmKey, "daemonCheckCBInterval", NULL, NULL, - (BYTE *) &dwValue, &dummyLen); - if (code == ERROR_SUCCESS) - cm_daemonCheckCBInterval = dwValue; - afsi_log("daemonCheckCBInterval is %d", cm_daemonCheckCBInterval); - - dummyLen = sizeof(DWORD); - code = RegQueryValueEx(parmKey, "daemonCheckLockInterval", NULL, NULL, - (BYTE *) &dwValue, &dummyLen); - if (code == ERROR_SUCCESS) - cm_daemonCheckLockInterval = dwValue; - afsi_log("daemonCheckLockInterval is %d", cm_daemonCheckLockInterval); - - dummyLen = sizeof(DWORD); - code = RegQueryValueEx(parmKey, "daemonCheckTokenInterval", NULL, NULL, - (BYTE *) &dwValue, &dummyLen); - if (code == ERROR_SUCCESS) - cm_daemonTokenCheckInterval = dwValue; - afsi_log("daemonCheckTokenInterval is %d", cm_daemonTokenCheckInterval); - - dummyLen = sizeof(DWORD); code = RegQueryValueEx(parmKey, "CallBackPort", NULL, NULL, (BYTE *) &dwValue, &dummyLen); if (code == ERROR_SUCCESS) { --- 997,1002 ---- *************** *** 1245,1251 **** osi_Log0(afsd_logp, "Loading Root Volume from cell"); do { code = cm_GetVolumeByName(cm_data.rootCellp, cm_rootVolumeName, cm_rootUserp, ! &req, CM_FLAG_CREATE, &cm_data.rootVolumep); afsi_log("cm_GetVolumeByName code %x root vol %x", code, (code ? (cm_volume_t *)-1 : cm_data.rootVolumep)); } while (code && --attempts); --- 1203,1209 ---- osi_Log0(afsd_logp, "Loading Root Volume from cell"); do { code = cm_GetVolumeByName(cm_data.rootCellp, cm_rootVolumeName, cm_rootUserp, ! &req, CM_GETVOL_FLAG_CREATE, &cm_data.rootVolumep); afsi_log("cm_GetVolumeByName code %x root vol %x", code, (code ? (cm_volume_t *)-1 : cm_data.rootVolumep)); } while (code && --attempts); Index: openafs/src/WINNT/afsd/afsd_service.c diff -c openafs/src/WINNT/afsd/afsd_service.c:1.52.4.9 openafs/src/WINNT/afsd/afsd_service.c:1.52.4.13 *** openafs/src/WINNT/afsd/afsd_service.c:1.52.4.9 Mon Dec 11 23:01:26 2006 --- openafs/src/WINNT/afsd/afsd_service.c Fri Jul 6 19:22:03 2007 *************** *** 76,81 **** --- 76,83 ---- buf_ForceTrace(TRUE); afsi_log("--- begin dump ---"); + cm_DumpCells(afsi_file, "a", 0); + cm_DumpVolumes(afsi_file, "a", 0); cm_DumpSCache(afsi_file, "a", 0); #ifdef keisa cm_dnlcDump(afsi_file, "a"); *************** *** 85,92 **** afsi_log("--- end dump ---"); #ifdef DEBUG ! if (IsDebuggerPresent()) ! DebugBreak(); #endif SetEvent(WaitToTerminate); --- 87,94 ---- afsi_log("--- end dump ---"); #ifdef DEBUG ! if (IsDebuggerPresent()) ! DebugBreak(); #endif SetEvent(WaitToTerminate); *************** *** 309,324 **** case PBT_APMQUERYSUSPEND: afsi_log("SERVICE_CONTROL_APMQUERYSUSPEND"); /* Write all dirty buffers back to server */ ! if ( !lana_OnlyLoopback() ) buf_CleanAndReset(); afsi_log("SERVICE_CONTROL_APMQUERYSUSPEND buf_CleanAndReset complete"); dwRet = NO_ERROR; break; case PBT_APMQUERYSTANDBY: afsi_log("SERVICE_CONTROL_APMQUERYSTANDBY"); /* Write all dirty buffers back to server */ ! if ( !lana_OnlyLoopback() ) buf_CleanAndReset(); afsi_log("SERVICE_CONTROL_APMQUERYSTANDBY buf_CleanAndReset complete"); dwRet = NO_ERROR; break; --- 311,330 ---- case PBT_APMQUERYSUSPEND: afsi_log("SERVICE_CONTROL_APMQUERYSUSPEND"); /* Write all dirty buffers back to server */ ! if ( !lana_OnlyLoopback() ) { buf_CleanAndReset(); + cm_SuspendSCache(); + } afsi_log("SERVICE_CONTROL_APMQUERYSUSPEND buf_CleanAndReset complete"); dwRet = NO_ERROR; break; case PBT_APMQUERYSTANDBY: afsi_log("SERVICE_CONTROL_APMQUERYSTANDBY"); /* Write all dirty buffers back to server */ ! if ( !lana_OnlyLoopback() ) { buf_CleanAndReset(); + cm_SuspendSCache(); + } afsi_log("SERVICE_CONTROL_APMQUERYSTANDBY buf_CleanAndReset complete"); dwRet = NO_ERROR; break; *************** *** 327,341 **** case PBT_APMSUSPEND: afsi_log("SERVICE_CONTROL_APMSUSPEND"); powerStateSuspended = 1; ! if (osVersion.dwMajorVersion >= 6) smb_StopListeners(); dwRet = NO_ERROR; break; case PBT_APMSTANDBY: afsi_log("SERVICE_CONTROL_APMSTANDBY"); powerStateSuspended = 1; ! if (osVersion.dwMajorVersion >= 6) smb_StopListeners(); dwRet = NO_ERROR; break; case PBT_APMRESUMECRITICAL: --- 333,351 ---- case PBT_APMSUSPEND: afsi_log("SERVICE_CONTROL_APMSUSPEND"); powerStateSuspended = 1; ! if (osVersion.dwMajorVersion >= 6) { ! cm_SuspendSCache(); smb_StopListeners(); + } dwRet = NO_ERROR; break; case PBT_APMSTANDBY: afsi_log("SERVICE_CONTROL_APMSTANDBY"); powerStateSuspended = 1; ! if (osVersion.dwMajorVersion >= 6) { ! cm_SuspendSCache(); smb_StopListeners(); + } dwRet = NO_ERROR; break; case PBT_APMRESUMECRITICAL: *************** *** 1231,1236 **** --- 1241,1249 ---- } } + /* Perform Volume Status Notification Initialization */ + cm_VolStatus_Initialization(); + #ifdef JUMP MainThreadId = GetCurrentThreadId(); jmpret = setjmp(notifier_jmp); *************** *** 1350,1355 **** --- 1363,1371 ---- LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_SERVICE_RUNNING); } + /* Notify any volume status handlers that we have started */ + cm_VolStatus_Service_Started(); + /* allow an exit to be called when started */ hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) *************** *** 1459,1464 **** --- 1475,1486 ---- PowerNotificationThreadExit(); #endif + /* Notify any Volume Status Handlers that we are stopped */ + cm_VolStatus_Service_Stopped(); + + /* Cleanup any Volume Status Notification Handler */ + cm_VolStatus_Finalize(); + /* allow an exit to be called after stopping the service */ hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) Index: openafs/src/WINNT/afsd/cm.h diff -c openafs/src/WINNT/afsd/cm.h:1.17.2.2 openafs/src/WINNT/afsd/cm.h:1.17.2.4 *** openafs/src/WINNT/afsd/cm.h:1.17.2.2 Mon Jan 15 14:52:19 2007 --- openafs/src/WINNT/afsd/cm.h Thu Jul 5 15:22:15 2007 *************** *** 300,303 **** --- 300,309 ---- #define CM_ERROR_TOOFEWBUFS (CM_ERROR_BASE+50) #define CM_ERROR_TOOMANYBUFS (CM_ERROR_BASE+51) #define CM_ERROR_BAD_LEVEL (CM_ERROR_BASE+52) + #define CM_ERROR_NOT_A_DFSLINK (CM_ERROR_BASE+53) + + /* Used by cm_FollowMountPoint and cm_GetVolumeByName */ + #define RWVOL 0 + #define ROVOL 1 + #define BACKVOL 2 #endif /* __CM_H_ENV__ */ Index: openafs/src/WINNT/afsd/cm_buf.c diff -c openafs/src/WINNT/afsd/cm_buf.c:1.31.2.15 openafs/src/WINNT/afsd/cm_buf.c:1.31.2.16 *** openafs/src/WINNT/afsd/cm_buf.c:1.31.2.15 Sun Feb 4 22:41:41 2007 --- openafs/src/WINNT/afsd/cm_buf.c Sun Jun 10 13:00:07 2007 *************** *** 316,322 **** cm_data.buf_hashSize = osi_PrimeLessThan((afs_uint32)(cm_data.buf_nbuffers/7 + 1)); /* create hash table */ ! memset((void *)cm_data.buf_hashTablepp, 0, cm_data.buf_hashSize * sizeof(cm_buf_t *)); /* another hash table */ memset((void *)cm_data.buf_fileHashTablepp, 0, cm_data.buf_hashSize * sizeof(cm_buf_t *)); --- 316,322 ---- cm_data.buf_hashSize = osi_PrimeLessThan((afs_uint32)(cm_data.buf_nbuffers/7 + 1)); /* create hash table */ ! memset((void *)cm_data.buf_scacheHashTablepp, 0, cm_data.buf_hashSize * sizeof(cm_buf_t *)); /* another hash table */ memset((void *)cm_data.buf_fileHashTablepp, 0, cm_data.buf_hashSize * sizeof(cm_buf_t *)); *************** *** 552,558 **** cm_buf_t *bp; i = BUF_HASH(&scp->fid, offsetp); ! for(bp = cm_data.buf_hashTablepp[i]; bp; bp=bp->hashp) { if (cm_FidCmp(&scp->fid, &bp->fid) == 0 && offsetp->LowPart == bp->offset.LowPart && offsetp->HighPart == bp->offset.HighPart) { --- 552,558 ---- cm_buf_t *bp; i = BUF_HASH(&scp->fid, offsetp); ! for(bp = cm_data.buf_scacheHashTablepp[i]; bp; bp=bp->hashp) { if (cm_FidCmp(&scp->fid, &bp->fid) == 0 && offsetp->LowPart == bp->offset.LowPart && offsetp->HighPart == bp->offset.HighPart) { *************** *** 691,697 **** /* Remove from hash */ i = BUF_HASH(&bp->fid, &bp->offset); ! lbpp = &(cm_data.buf_hashTablepp[i]); for(tbp = *lbpp; tbp; lbpp = &tbp->hashp, tbp = *lbpp) { if (tbp == bp) break; } --- 691,697 ---- /* Remove from hash */ i = BUF_HASH(&bp->fid, &bp->offset); ! lbpp = &(cm_data.buf_scacheHashTablepp[i]); for(tbp = *lbpp; tbp; lbpp = &tbp->hashp, tbp = *lbpp) { if (tbp == bp) break; } *************** *** 864,871 **** #endif bp->offset = *offsetp; i = BUF_HASH(&scp->fid, offsetp); ! bp->hashp = cm_data.buf_hashTablepp[i]; ! cm_data.buf_hashTablepp[i] = bp; i = BUF_FILEHASH(&scp->fid); nextBp = cm_data.buf_fileHashTablepp[i]; bp->fileHashp = nextBp; --- 864,871 ---- #endif bp->offset = *offsetp; i = BUF_HASH(&scp->fid, offsetp); ! bp->hashp = cm_data.buf_scacheHashTablepp[i]; ! cm_data.buf_scacheHashTablepp[i] = bp; i = BUF_FILEHASH(&scp->fid); nextBp = cm_data.buf_fileHashTablepp[i]; bp->fileHashp = nextBp; *************** *** 1242,1248 **** lock_ObtainWrite(&buf_globalLock); for(i=0; ihashp) { if ((bp->flags & CM_BUF_DIRTY) == CM_BUF_DIRTY) { buf_HoldLocked(bp); lock_ReleaseWrite(&buf_globalLock); --- 1242,1248 ---- lock_ObtainWrite(&buf_globalLock); for(i=0; ihashp) { if ((bp->flags & CM_BUF_DIRTY) == CM_BUF_DIRTY) { buf_HoldLocked(bp); lock_ReleaseWrite(&buf_globalLock); *************** *** 1602,1608 **** } #endif /* TESTING */ ! /* dump the contents of the buf_hashTablepp. */ int cm_DumpBufHashTable(FILE *outputFile, char *cookie, int lock) { int zilch; --- 1602,1608 ---- } #endif /* TESTING */ ! /* dump the contents of the buf_scacheHashTablepp. */ int cm_DumpBufHashTable(FILE *outputFile, char *cookie, int lock) { int zilch; *************** *** 1610,1616 **** char output[1024]; afs_uint32 i; ! if (cm_data.buf_hashTablepp == NULL) return -1; if (lock) --- 1610,1616 ---- char output[1024]; afs_uint32 i; ! if (cm_data.buf_scacheHashTablepp == NULL) return -1; if (lock) *************** *** 1622,1628 **** for (i = 0; i < cm_data.buf_hashSize; i++) { ! for (bp = cm_data.buf_hashTablepp[i]; bp; bp=bp->hashp) { StringCbPrintfA(output, sizeof(output), "%s bp=0x%08X, hash=%d, fid (cell=%d, volume=%d, " --- 1622,1628 ---- for (i = 0; i < cm_data.buf_hashSize; i++) { ! for (bp = cm_data.buf_scacheHashTablepp[i]; bp; bp=bp->hashp) { StringCbPrintfA(output, sizeof(output), "%s bp=0x%08X, hash=%d, fid (cell=%d, volume=%d, " Index: openafs/src/WINNT/afsd/cm_callback.c diff -c openafs/src/WINNT/afsd/cm_callback.c:1.41.4.11 openafs/src/WINNT/afsd/cm_callback.c:1.41.4.17 *** openafs/src/WINNT/afsd/cm_callback.c:1.41.4.11 Wed Feb 7 12:35:16 2007 --- openafs/src/WINNT/afsd/cm_callback.c Sat Jul 7 09:38:33 2007 *************** *** 165,171 **** * * The callp parameter is currently unused. */ ! void cm_RevokeCallback(struct rx_call *callp, AFSFid *fidp) { cm_fid_t tfid; cm_scache_t *scp; --- 165,171 ---- * * The callp parameter is currently unused. */ ! void cm_RevokeCallback(struct rx_call *callp, cm_cell_t * cellp, AFSFid *fidp) { cm_fid_t tfid; cm_scache_t *scp; *************** *** 195,204 **** /* do all in the hash bucket, since we don't know how many we'll find with * varying cells. */ ! for (scp = cm_data.hashTablep[hash]; scp; scp=scp->nextp) { if (scp->fid.volume == tfid.volume && scp->fid.vnode == tfid.vnode && scp->fid.unique == tfid.unique && scp->cbExpires > 0 && scp->cbServerp != NULL) { --- 195,205 ---- /* do all in the hash bucket, since we don't know how many we'll find with * varying cells. */ ! for (scp = cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { if (scp->fid.volume == tfid.volume && scp->fid.vnode == tfid.vnode && scp->fid.unique == tfid.unique && + (cellp == NULL || scp->fid.cell == cellp->cellID) && scp->cbExpires > 0 && scp->cbServerp != NULL) { *************** *** 206,215 **** --- 207,219 ---- lock_ReleaseWrite(&cm_scacheLock); osi_Log4(afsd_logp, "RevokeCallback Discarding SCache scp 0x%p vol %u vn %u uniq %u", scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique); + lock_ObtainMutex(&scp->mx); cm_DiscardSCache(scp); lock_ReleaseMutex(&scp->mx); + cm_CallbackNotifyChange(scp); + lock_ObtainWrite(&cm_scacheLock); cm_ReleaseSCacheNoLock(scp); } *************** *** 225,231 **** * * Called with no locks held. */ ! void cm_RevokeVolumeCallback(struct rx_call *callp, AFSFid *fidp) { long hash; cm_scache_t *scp; --- 229,235 ---- * * Called with no locks held. */ ! void cm_RevokeVolumeCallback(struct rx_call *callp, cm_cell_t *cellp, AFSFid *fidp) { long hash; cm_scache_t *scp; *************** *** 242,261 **** tfid.volume = fidp->Volume; cm_RecordRacingRevoke(&tfid, CM_RACINGFLAG_CANCELVOL); - lock_ObtainWrite(&cm_scacheLock); ! for (hash = 0; hash < cm_data.hashTableSize; hash++) { ! for(scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) { if (scp->fid.volume == fidp->Volume && scp->cbExpires > 0 && scp->cbServerp != NULL) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); lock_ObtainMutex(&scp->mx); osi_Log4(afsd_logp, "RevokeVolumeCallback Discarding SCache scp 0x%p vol %u vn %u uniq %u", scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique); cm_DiscardSCache(scp); lock_ReleaseMutex(&scp->mx); cm_CallbackNotifyChange(scp); lock_ObtainWrite(&cm_scacheLock); cm_ReleaseSCacheNoLock(scp); --- 246,267 ---- tfid.volume = fidp->Volume; cm_RecordRacingRevoke(&tfid, CM_RACINGFLAG_CANCELVOL); lock_ObtainWrite(&cm_scacheLock); ! for (hash = 0; hash < cm_data.scacheHashTableSize; hash++) { ! for(scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { if (scp->fid.volume == fidp->Volume && + (cellp == NULL || scp->fid.cell == cellp->cellID) && scp->cbExpires > 0 && scp->cbServerp != NULL) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); + lock_ObtainMutex(&scp->mx); osi_Log4(afsd_logp, "RevokeVolumeCallback Discarding SCache scp 0x%p vol %u vn %u uniq %u", scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique); cm_DiscardSCache(scp); lock_ReleaseMutex(&scp->mx); + cm_CallbackNotifyChange(scp); lock_ObtainWrite(&cm_scacheLock); cm_ReleaseSCacheNoLock(scp); *************** *** 343,354 **** --- 349,366 ---- struct rx_peer *peerp; unsigned long host = 0; unsigned short port = 0; + cm_server_t *tsp = NULL; + cm_cell_t * cellp = NULL; MUTEX_ENTER(&callp->lock); if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) { host = rx_HostOf(peerp); port = rx_PortOf(peerp); + + tsp = cm_FindServerByIP(host, CM_SERVER_FILE); + if (tsp) + cellp = tsp->cellp; } osi_Log2(afsd_logp, "SRXAFSCB_CallBack from host 0x%x port %d", *************** *** 361,369 **** if (tfidp->Volume == 0) continue; /* means don't do anything */ else if (tfidp->Vnode == 0) ! cm_RevokeVolumeCallback(callp, tfidp); else ! cm_RevokeCallback(callp, tfidp); } MUTEX_EXIT(&callp->lock); --- 373,381 ---- if (tfidp->Volume == 0) continue; /* means don't do anything */ else if (tfidp->Vnode == 0) ! cm_RevokeVolumeCallback(callp, cellp, tfidp); else ! cm_RevokeCallback(callp, cellp, tfidp); } MUTEX_EXIT(&callp->lock); *************** *** 450,457 **** * are "rare," hopefully this won't be a problem. */ lock_ObtainWrite(&cm_scacheLock); ! for (hash = 0; hash < cm_data.hashTableSize; hash++) { ! for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); lock_ObtainMutex(&scp->mx); --- 462,469 ---- * are "rare," hopefully this won't be a problem. */ lock_ObtainWrite(&cm_scacheLock); ! for (hash = 0; hash < cm_data.scacheHashTableSize; hash++) { ! for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); lock_ObtainMutex(&scp->mx); *************** *** 482,488 **** /* we're done with the server structure */ cm_PutServer(tsp); ! } } MUTEX_EXIT(&callp->lock); return 0; --- 494,500 ---- /* we're done with the server structure */ cm_PutServer(tsp); ! } } MUTEX_EXIT(&callp->lock); return 0; *************** *** 693,700 **** ntohl(host), ntohs(port)); lock_ObtainRead(&cm_scacheLock); ! for (i = 0; i < cm_data.hashTableSize; i++) { ! for (scp = cm_data.hashTablep[i]; scp; scp = scp->nextp) { if (index == 0) goto searchDone; index--; --- 705,712 ---- ntohl(host), ntohs(port)); lock_ObtainRead(&cm_scacheLock); ! for (i = 0; i < cm_data.scacheHashTableSize; i++) { ! for (scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp) { if (index == 0) goto searchDone; index--; *************** *** 799,806 **** ntohl(host), ntohs(port)); lock_ObtainRead(&cm_scacheLock); ! for (i = 0; i < cm_data.hashTableSize; i++) { ! for (scp = cm_data.hashTablep[i]; scp; scp = scp->nextp) { if (index == 0) goto searchDone; index--; --- 811,818 ---- ntohl(host), ntohs(port)); lock_ObtainRead(&cm_scacheLock); ! for (i = 0; i < cm_data.scacheHashTableSize; i++) { ! for (scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp) { if (index == 0) goto searchDone; index--; *************** *** 1522,1528 **** cm_racingRevokes_t *revp; /* where we are */ cm_racingRevokes_t *nrevp; /* where we'll be next */ int freeFlag; ! cm_server_t * serverp = 0; int discardScp = 0; lock_ObtainWrite(&cm_callbackLock); --- 1534,1540 ---- cm_racingRevokes_t *revp; /* where we are */ cm_racingRevokes_t *nrevp; /* where we'll be next */ int freeFlag; ! cm_server_t * serverp = NULL; int discardScp = 0; lock_ObtainWrite(&cm_callbackLock); *************** *** 1603,1609 **** lock_ReleaseMutex(&scp->mx); cm_CallbackNotifyChange(scp); lock_ObtainMutex(&scp->mx); ! } if ( serverp ) { lock_ObtainWrite(&cm_serverLock); --- 1615,1621 ---- lock_ReleaseMutex(&scp->mx); cm_CallbackNotifyChange(scp); lock_ObtainMutex(&scp->mx); ! } if ( serverp ) { lock_ObtainWrite(&cm_serverLock); *************** *** 1697,1703 **** osi_Log4(afsd_logp, "CALL FetchStatus scp 0x%p vol %u vn %u uniq %u", scp, sfid.volume, sfid.vnode, sfid.unique); do { ! code = cm_Conn(&sfid, userp, reqp, &connp); if (code) continue; --- 1709,1715 ---- osi_Log4(afsd_logp, "CALL FetchStatus scp 0x%p vol %u vn %u uniq %u", scp, sfid.volume, sfid.vnode, sfid.unique); do { ! code = cm_ConnFromFID(&sfid, userp, reqp, &connp); if (code) continue; *************** *** 1755,1762 **** now = osi_Time(); lock_ObtainWrite(&cm_scacheLock); ! for (i=0; inextp) { cm_HoldSCacheNoLock(scp); if (scp->cbExpires > 0 && (scp->cbServerp == NULL || now > scp->cbExpires)) { lock_ReleaseWrite(&cm_scacheLock); --- 1767,1774 ---- now = osi_Time(); lock_ObtainWrite(&cm_scacheLock); ! for (i=0; inextp) { cm_HoldSCacheNoLock(scp); if (scp->cbExpires > 0 && (scp->cbServerp == NULL || now > scp->cbExpires)) { lock_ReleaseWrite(&cm_scacheLock); *************** *** 1776,1778 **** --- 1788,1827 ---- osi_Log0(afsd_logp, "CheckCBExpiration Complete"); } + + void + cm_GiveUpAllCallbacks(cm_server_t *tsp) + { + long code; + cm_conn_t *connp; + struct rx_connection * rxconnp; + + if (tsp->type == CM_SERVER_FILE && !(tsp->flags & CM_SERVERFLAG_DOWN)) { + code = cm_ConnByServer(tsp, cm_rootUserp, &connp); + if (code == 0) { + rxconnp = cm_GetRxConn(connp); + rx_SetConnDeadTime(rxconnp, 10); + code = RXAFS_GiveUpAllCallBacks(rxconnp); + rx_SetConnDeadTime(rxconnp, ConnDeadtimeout); + rx_PutConnection(rxconnp); + } + } + } + + void + cm_GiveUpAllCallbacksAllServers(void) + { + cm_server_t *tsp; + + lock_ObtainWrite(&cm_serverLock); + for (tsp = cm_allServersp; tsp; tsp = tsp->allNextp) { + cm_GetServerNoLock(tsp); + lock_ReleaseWrite(&cm_serverLock); + cm_GiveUpAllCallbacks(tsp); + lock_ObtainWrite(&cm_serverLock); + cm_PutServerNoLock(tsp); + } + lock_ReleaseWrite(&cm_serverLock); + } + + Index: openafs/src/WINNT/afsd/cm_callback.h diff -c openafs/src/WINNT/afsd/cm_callback.h:1.7 openafs/src/WINNT/afsd/cm_callback.h:1.7.4.2 *** openafs/src/WINNT/afsd/cm_callback.h:1.7 Sat Nov 5 01:47:46 2005 --- openafs/src/WINNT/afsd/cm_callback.h Thu Jun 28 00:50:15 2007 *************** *** 68,71 **** --- 68,75 ---- extern void cm_CallbackNotifyChange(cm_scache_t *scp); + extern void cm_GiveUpAllCallbacks(cm_server_t *tsp); + + extern void cm_GiveUpAllCallbacksAllServers(void); + #endif /* _CM_CALLBACK_H_ENV__ */ Index: openafs/src/WINNT/afsd/cm_cell.c diff -c openafs/src/WINNT/afsd/cm_cell.c:1.23.2.1 openafs/src/WINNT/afsd/cm_cell.c:1.23.2.6 *** openafs/src/WINNT/afsd/cm_cell.c:1.23.2.1 Sat Oct 21 16:47:48 2006 --- openafs/src/WINNT/afsd/cm_cell.c Fri Jun 22 18:16:39 2007 *************** *** 46,52 **** tsp = cm_NewServer(addrp, CM_SERVER_VLDB, cellp); /* Insert the vlserver into a sorted list, sorted by server rank */ ! tsrp = cm_NewServerRef(tsp); cm_InsertServerList(&cellp->vlServersp, tsrp); /* drop the allocation reference */ lock_ObtainWrite(&cm_serverLock); --- 46,52 ---- tsp = cm_NewServer(addrp, CM_SERVER_VLDB, cellp); /* Insert the vlserver into a sorted list, sorted by server rank */ ! tsrp = cm_NewServerRef(tsp, 0); cm_InsertServerList(&cellp->vlServersp, tsrp); /* drop the allocation reference */ lock_ObtainWrite(&cm_serverLock); *************** *** 79,85 **** ) { /* must empty cp->vlServersp */ if (cp->vlServersp) { ! cm_FreeServerList(&cp->vlServersp); cp->vlServersp = NULL; } --- 79,85 ---- ) { /* must empty cp->vlServersp */ if (cp->vlServersp) { ! cm_FreeServerList(&cp->vlServersp, CM_FREESERVERLIST_DELETE); cp->vlServersp = NULL; } *************** *** 115,145 **** } /* load up a cell structure from the cell database, afsdcell.ini */ ! cm_cell_t *cm_GetCell(char *namep, long flags) { return cm_GetCell_Gen(namep, NULL, flags); } ! cm_cell_t *cm_GetCell_Gen(char *namep, char *newnamep, long flags) { ! cm_cell_t *cp; long code; char fullname[200]=""; if (!strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH)) return NULL; ! lock_ObtainWrite(&cm_cellLock); ! for (cp = cm_data.allCellsp; cp; cp=cp->nextp) { if (stricmp(namep, cp->name) == 0) { strcpy(fullname, cp->name); break; } } if (cp) { ! cp = cm_UpdateCell(cp); } else if (flags & CM_FLAG_CREATE) { if ( cm_data.currentCells >= cm_data.maxCells ) osi_panic("Exceeded Max Cells", __FILE__, __LINE__); --- 115,166 ---- } /* load up a cell structure from the cell database, afsdcell.ini */ ! cm_cell_t *cm_GetCell(char *namep, afs_uint32 flags) { return cm_GetCell_Gen(namep, NULL, flags); } ! cm_cell_t *cm_GetCell_Gen(char *namep, char *newnamep, afs_uint32 flags) { ! cm_cell_t *cp, *cp2; long code; char fullname[200]=""; + int hasWriteLock = 0; + afs_uint32 hash; if (!strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH)) return NULL; ! hash = CM_CELL_NAME_HASH(namep); ! ! lock_ObtainRead(&cm_cellLock); ! for (cp = cm_data.cellNameHashTablep[hash]; cp; cp=cp->nameNextp) { if (stricmp(namep, cp->name) == 0) { strcpy(fullname, cp->name); break; } } + lock_ReleaseRead(&cm_cellLock); if (cp) { ! cm_UpdateCell(cp); } else if (flags & CM_FLAG_CREATE) { + lock_ObtainWrite(&cm_cellLock); + hasWriteLock = 1; + + /* when we dropped the lock the cell could have been added + * to the list so check again while holding the write lock + */ + for (cp = cm_data.cellNameHashTablep[hash]; cp; cp=cp->nameNextp) { + if (stricmp(namep, cp->name) == 0) { + strcpy(fullname, cp->name); + break; + } + } + + if (cp) + goto done; + if ( cm_data.currentCells >= cm_data.maxCells ) osi_panic("Exceeded Max Cells", __FILE__, __LINE__); *************** *** 181,186 **** --- 202,226 ---- cp->timeout = time(0) + 7200; /* two hour timeout */ } + /* we have now been given the fullname of the cell. It may + * be that we already have a cell with that name. If so, + * we should use it instead of completing the allocation + * of a new cm_cell_t + */ + hash = CM_CELL_NAME_HASH(fullname); + for (cp2 = cm_data.cellNameHashTablep[hash]; cp2; cp2=cp2->nameNextp) { + if (stricmp(fullname, cp2->name) == 0) { + break; + } + } + + if (cp2) { + cm_FreeServerList(&cp->vlServersp, CM_FREESERVERLIST_DELETE); + cp = cp2; + goto done; + } + + /* randomise among those vlservers having the same rank*/ cm_RandomizeServer(&cp->vlServersp); *************** *** 191,227 **** strncpy(cp->name, fullname, CELL_MAXNAMELEN); cp->name[CELL_MAXNAMELEN-1] = '\0'; - /* thread on global list */ - cp->nextp = cm_data.allCellsp; - cm_data.allCellsp = cp; - /* the cellID cannot be 0 */ cp->cellID = ++cm_data.currentCells; } done: /* fullname is not valid if cp == NULL */ if (cp && newnamep) strcpy(newnamep, fullname); - lock_ReleaseWrite(&cm_cellLock); return cp; } cm_cell_t *cm_FindCellByID(afs_int32 cellID) { cm_cell_t *cp; ! lock_ObtainWrite(&cm_cellLock); ! for (cp = cm_data.allCellsp; cp; cp=cp->nextp) { if (cellID == cp->cellID) break; } if (cp) ! cp = cm_UpdateCell(cp); - lock_ReleaseWrite(&cm_cellLock); return cp; } --- 231,282 ---- strncpy(cp->name, fullname, CELL_MAXNAMELEN); cp->name[CELL_MAXNAMELEN-1] = '\0'; /* the cellID cannot be 0 */ cp->cellID = ++cm_data.currentCells; + + /* append cell to global list */ + if (cm_data.allCellsp == NULL) { + cm_data.allCellsp = cp; + } else { + for (cp2 = cm_data.allCellsp; cp2->allNextp; cp2=cp2->allNextp) + ; + cp2->allNextp = cp; + } + cp->allNextp = NULL; + + cm_AddCellToNameHashTable(cp); + cm_AddCellToIDHashTable(cp); } done: + if (hasWriteLock) + lock_ReleaseWrite(&cm_cellLock); + /* fullname is not valid if cp == NULL */ if (cp && newnamep) strcpy(newnamep, fullname); return cp; } cm_cell_t *cm_FindCellByID(afs_int32 cellID) { cm_cell_t *cp; + afs_uint32 hash; + + lock_ObtainRead(&cm_cellLock); + + hash = CM_CELL_ID_HASH(cellID); ! for (cp = cm_data.cellIDHashTablep[hash]; cp; cp=cp->idNextp) { if (cellID == cp->cellID) break; } + lock_ReleaseRead(&cm_cellLock); if (cp) ! cm_UpdateCell(cp); return cp; } *************** *** 231,237 **** cm_cell_t * cellp; afs_uint32 count; ! for (cellp = cm_data.allCellsp, count = 0; cellp; cellp=cellp->nextp, count++) { if ( cellp->magic != CM_CELL_MAGIC ) { afsi_log("cm_ValidateCell failure: cellp->magic != CM_CELL_MAGIC"); fprintf(stderr, "cm_ValidateCell failure: cellp->magic != CM_CELL_MAGIC\n"); --- 286,292 ---- cm_cell_t * cellp; afs_uint32 count; ! for (cellp = cm_data.allCellsp, count = 0; cellp; cellp=cellp->allNextp, count++) { if ( cellp->magic != CM_CELL_MAGIC ) { afsi_log("cm_ValidateCell failure: cellp->magic != CM_CELL_MAGIC"); fprintf(stderr, "cm_ValidateCell failure: cellp->magic != CM_CELL_MAGIC\n"); *************** *** 260,266 **** { cm_cell_t * cellp; ! for (cellp = cm_data.allCellsp; cellp; cellp=cellp->nextp) lock_FinalizeMutex(&cellp->mx); return 0; --- 315,321 ---- { cm_cell_t * cellp; ! for (cellp = cm_data.allCellsp; cellp; cellp=cellp->allNextp) lock_FinalizeMutex(&cellp->mx); return 0; *************** *** 280,285 **** --- 335,342 ---- cm_data.allCellsp = NULL; cm_data.currentCells = 0; cm_data.maxCells = maxCells; + memset(cm_data.cellNameHashTablep, 0, sizeof(cm_cell_t *) * cm_data.cellHashTableSize); + memset(cm_data.cellIDHashTablep, 0, sizeof(cm_cell_t *) * cm_data.cellHashTableSize); #ifdef AFS_FREELANCE_CLIENT /* Generate a dummy entry for the Freelance cell whether or not *************** *** 296,302 **** strncpy(cellp->name, "Freelance.Local.Cell", CELL_MAXNAMELEN); /*safe*/ /* thread on global list */ ! cellp->nextp = cm_data.allCellsp; cm_data.allCellsp = cellp; cellp->cellID = AFS_FAKE_ROOT_CELL_ID; --- 353,359 ---- strncpy(cellp->name, "Freelance.Local.Cell", CELL_MAXNAMELEN); /*safe*/ /* thread on global list */ ! cellp->allNextp = cm_data.allCellsp; cm_data.allCellsp = cellp; cellp->cellID = AFS_FAKE_ROOT_CELL_ID; *************** *** 304,310 **** cellp->flags = CM_CELLFLAG_FREELANCE; #endif } else { ! for (cellp = cm_data.allCellsp; cellp; cellp=cellp->nextp) { lock_InitializeMutex(&cellp->mx, "cm_cell_t mutex"); cellp->vlServersp = NULL; } --- 361,367 ---- cellp->flags = CM_CELLFLAG_FREELANCE; #endif } else { ! for (cellp = cm_data.allCellsp; cellp; cellp=cellp->allNextp) { lock_InitializeMutex(&cellp->mx, "cm_cell_t mutex"); cellp->vlServersp = NULL; } *************** *** 331,333 **** --- 388,494 ---- } } + int cm_DumpCells(FILE *outputFile, char *cookie, int lock) + { + cm_cell_t *cellp; + int zilch; + char output[1024]; + + if (lock) + lock_ObtainRead(&cm_cellLock); + + sprintf(output, "%s - dumping cells - cm_data.currentCells=%d, cm_data.maxCells=%d\r\n", + cookie, cm_data.currentCells, cm_data.maxCells); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + + for (cellp = cm_data.allCellsp; cellp; cellp=cellp->allNextp) { + sprintf(output, "%s cellp=0x%p,name=%s ID=%d flags=0x%x\r\n", + cookie, cellp, cellp->name, cellp->cellID, cellp->flags); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + } + + sprintf(output, "%s - Done dumping cells.\r\n", cookie); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + + if (lock) + lock_ReleaseRead(&cm_cellLock); + + return(0); + } + + /* call with volume write-locked and mutex held */ + void cm_AddCellToNameHashTable(cm_cell_t *cellp) + { + int i; + + if (cellp->flags & CM_CELLFLAG_IN_NAMEHASH) + return; + + i = CM_CELL_NAME_HASH(cellp->name); + + cellp->nameNextp = cm_data.cellNameHashTablep[i]; + cm_data.cellNameHashTablep[i] = cellp; + cellp->flags |= CM_CELLFLAG_IN_NAMEHASH; + } + + /* call with cell write-locked and mutex held */ + void cm_RemoveCellFromNameHashTable(cm_cell_t *cellp) + { + cm_cell_t **lcellpp; + cm_cell_t *tcellp; + int i; + + if (cellp->flags & CM_CELLFLAG_IN_NAMEHASH) { + /* hash it out first */ + i = CM_CELL_NAME_HASH(cellp->name); + for (lcellpp = &cm_data.cellNameHashTablep[i], tcellp = cm_data.cellNameHashTablep[i]; + tcellp; + lcellpp = &tcellp->nameNextp, tcellp = tcellp->nameNextp) { + if (tcellp == cellp) { + *lcellpp = cellp->nameNextp; + cellp->flags &= ~CM_CELLFLAG_IN_NAMEHASH; + cellp->nameNextp = NULL; + break; + } + } + } + } + + /* call with cell write-locked and mutex held */ + void cm_AddCellToIDHashTable(cm_cell_t *cellp) + { + int i; + + if (cellp->flags & CM_CELLFLAG_IN_IDHASH) + return; + + i = CM_CELL_ID_HASH(cellp->cellID); + + cellp->idNextp = cm_data.cellIDHashTablep[i]; + cm_data.cellIDHashTablep[i] = cellp; + cellp->flags |= CM_CELLFLAG_IN_IDHASH; + } + + /* call with cell write-locked and mutex held */ + void cm_RemoveCellFromIDHashTable(cm_cell_t *cellp) + { + cm_cell_t **lcellpp; + cm_cell_t *tcellp; + int i; + + if (cellp->flags & CM_CELLFLAG_IN_IDHASH) { + /* hash it out first */ + i = CM_CELL_ID_HASH(cellp->cellID); + for (lcellpp = &cm_data.cellIDHashTablep[i], tcellp = cm_data.cellIDHashTablep[i]; + tcellp; + lcellpp = &tcellp->idNextp, tcellp = tcellp->idNextp) { + if (tcellp == cellp) { + *lcellpp = cellp->idNextp; + cellp->flags &= ~CM_CELLFLAG_IN_IDHASH; + cellp->idNextp = NULL; + break; + } + } + } + } + Index: openafs/src/WINNT/afsd/cm_cell.h diff -c openafs/src/WINNT/afsd/cm_cell.h:1.7.6.1 openafs/src/WINNT/afsd/cm_cell.h:1.7.6.5 *** openafs/src/WINNT/afsd/cm_cell.h:1.7.6.1 Sat Oct 21 16:47:48 2006 --- openafs/src/WINNT/afsd/cm_cell.h Wed Jun 27 20:34:26 2007 *************** *** 10,17 **** #ifndef __CELL_H_ENV_ #define __CELL_H_ENV_ 1 - #include "cm_server.h" - #define CELL_MAXNAMELEN 256 #define CM_CELL_MAGIC ('C' | 'E' <<8 | 'L'<<16 | 'L'<<24) --- 10,15 ---- *************** *** 20,26 **** typedef struct cm_cell { afs_uint32 magic; afs_int32 cellID; /* cell ID */ ! struct cm_cell *nextp; /* locked by cm_cellLock */ char name[CELL_MAXNAMELEN]; /* cell name; never changes */ cm_serverRef_t *vlServersp; /* locked by cm_serverLock */ osi_mutex_t mx; /* mutex locking fields (flags) */ --- 18,26 ---- typedef struct cm_cell { afs_uint32 magic; afs_int32 cellID; /* cell ID */ ! struct cm_cell *allNextp; /* locked by cm_cellLock */ ! struct cm_cell *nameNextp; /* locked by cm_cellLock */ ! struct cm_cell *idNextp; /* locked by cm_cellLock */ char name[CELL_MAXNAMELEN]; /* cell name; never changes */ cm_serverRef_t *vlServersp; /* locked by cm_serverLock */ osi_mutex_t mx; /* mutex locking fields (flags) */ *************** *** 29,38 **** } cm_cell_t; /* These are bit flag values */ ! #define CM_CELLFLAG_SUID 1 /* setuid flag; not yet used */ ! #define CM_CELLFLAG_DNS 2 /* cell servers are from DNS */ ! #define CM_CELLFLAG_VLSERVER_INVALID 4 /* cell servers are invalid */ ! #define CM_CELLFLAG_FREELANCE 8 /* local freelance fake cell */ extern void cm_InitCell(int newFile, long maxCells); --- 29,44 ---- } cm_cell_t; /* These are bit flag values */ ! #define CM_CELLFLAG_SUID 1 /* setuid flag; not yet used */ ! #define CM_CELLFLAG_DNS 2 /* cell servers are from DNS */ ! #define CM_CELLFLAG_VLSERVER_INVALID 4 /* cell servers are invalid */ ! #define CM_CELLFLAG_FREELANCE 8 /* local freelance fake cell */ ! #define CM_CELLFLAG_IN_NAMEHASH 0x10 ! #define CM_CELLFLAG_IN_IDHASH 0x20 ! ! #define CM_CELL_NAME_HASH(name) (SDBMHash(name) % cm_data.cellHashTableSize) ! ! #define CM_CELL_ID_HASH(id) ((unsigned long) id % cm_data.cellHashTableSize) extern void cm_InitCell(int newFile, long maxCells); *************** *** 40,55 **** extern long cm_ValidateCell(void); ! extern cm_cell_t *cm_GetCell(char *namep, long flags); ! extern cm_cell_t *cm_GetCell_Gen(char *namep, char *newnamep, long flags); extern cm_cell_t *cm_FindCellByID(afs_int32 cellID); ! extern void cm_ChangeRankCellVLServer(cm_server_t *tsp); extern osi_rwlock_t cm_cellLock; extern cm_cell_t *cm_allCellsp; #endif /* __CELL_H_ENV_ */ --- 46,67 ---- extern long cm_ValidateCell(void); ! extern cm_cell_t *cm_GetCell(char *namep, afs_uint32 flags); ! extern cm_cell_t *cm_GetCell_Gen(char *namep, char *newnamep, afs_uint32 flags); extern cm_cell_t *cm_FindCellByID(afs_int32 cellID); ! extern void cm_ChangeRankCellVLServer(cm_server_t *tsp); extern osi_rwlock_t cm_cellLock; extern cm_cell_t *cm_allCellsp; + extern int cm_DumpCells(FILE *, char *, int); + + extern void cm_AddCellToNameHashTable(cm_cell_t * cellp); + + extern void cm_AddCellToIDHashTable(cm_cell_t * cellp); + #endif /* __CELL_H_ENV_ */ Index: openafs/src/WINNT/afsd/cm_config.c diff -c openafs/src/WINNT/afsd/cm_config.c:1.26 openafs/src/WINNT/afsd/cm_config.c:1.26.4.1 *** openafs/src/WINNT/afsd/cm_config.c:1.26 Mon Dec 19 07:42:23 2005 --- openafs/src/WINNT/afsd/cm_config.c Wed Jun 27 20:34:26 2007 *************** *** 7,16 **** * directory or online at http://www.openafs.org/dl/license10.html */ - #include - #include - #include - #ifndef DJGPP #include #include --- 7,12 ---- *************** *** 25,35 **** --- 21,38 ---- #include "afsd.h" #include #include + + #include + #include + #include + #ifdef AFS_AFSDB_ENV #include "cm_dns.h" #include #endif + + /* TODO: these should be pulled in from dirpath.h */ #if !defined(DJGPP) && !defined(AFS_WIN95_ENV) #define AFS_THISCELL "ThisCell" Index: openafs/src/WINNT/afsd/cm_conn.c diff -c openafs/src/WINNT/afsd/cm_conn.c:1.49.2.13 openafs/src/WINNT/afsd/cm_conn.c:1.49.2.19 *** openafs/src/WINNT/afsd/cm_conn.c:1.49.2.13 Sat Apr 14 14:49:36 2007 --- openafs/src/WINNT/afsd/cm_conn.c Mon Jun 25 00:59:40 2007 *************** *** 119,132 **** if (!fidp) { *serversppp = NULL; ! return 0; } cellp = cm_FindCellByID(fidp->cell); ! if (!cellp) return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, &volp); ! if (code) return code; *serversppp = cm_GetVolServers(volp, fidp->volume); --- 119,134 ---- if (!fidp) { *serversppp = NULL; ! return CM_ERROR_INVAL; } cellp = cm_FindCellByID(fidp->cell); ! if (!cellp) ! return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, CM_GETVOL_FLAG_CREATE, &volp); ! if (code) ! return code; *serversppp = cm_GetVolServers(volp, fidp->volume); *************** *** 139,150 **** * and if we're going to retry, determine whether failover is appropriate, * and whether timed backoff is appropriate. * ! * If the error code is from cm_Conn() or friends, it will be a CM_ERROR code. * Otherwise it will be an RPC code. This may be a UNIX code (e.g. EDQUOT), or * it may be an RX code, or it may be a special code (e.g. VNOVOL), or it may * be a security code (e.g. RXKADEXPIRED). * ! * If the error code is from cm_Conn() or friends, connp will be NULL. * * For VLDB calls, fidp will be NULL. * --- 141,152 ---- * and if we're going to retry, determine whether failover is appropriate, * and whether timed backoff is appropriate. * ! * If the error code is from cm_ConnFromFID() or friends, it will be a CM_ERROR code. * Otherwise it will be an RPC code. This may be a UNIX code (e.g. EDQUOT), or * it may be an RX code, or it may be a special code (e.g. VNOVOL), or it may * be a security code (e.g. RXKADEXPIRED). * ! * If the error code is from cm_ConnFromFID() or friends, connp will be NULL. * * For VLDB calls, fidp will be NULL. * *************** *** 162,167 **** --- 164,171 ---- cm_serverRef_t *tsrp; cm_cell_t *cellp = NULL; cm_ucell_t *ucellp; + cm_volume_t * volp = NULL; + cm_vol_state_t *statep = NULL; int retry = 0; int free_svr_list = 0; int dead_session; *************** *** 210,227 **** /* leave 5 seconds margin for sleep */ timeLeft = HardDeadtimeout - timeUsed; if (errorCode == CM_ERROR_TIMEDOUT) { if (timeLeft > 5 ) { thrd_Sleep(3000); - if (cellp == NULL && serverp) - cellp = serverp->cellp; - if (cellp == NULL && serversp) { - struct cm_serverRef * refp; - for ( refp=serversp ; cellp == NULL && refp != NULL; refp=refp->next) { - if ( refp->server ) - cellp = refp->server->cellp; - } - } cm_CheckServers(CM_FLAG_CHECKDOWNSERVERS, cellp); retry = 1; } --- 214,238 ---- /* leave 5 seconds margin for sleep */ timeLeft = HardDeadtimeout - timeUsed; + /* get a pointer to the cell */ + if (errorCode) { + if (cellp == NULL && serverp) + cellp = serverp->cellp; + if (cellp == NULL && serversp) { + struct cm_serverRef * refp; + for ( refp=serversp ; cellp == NULL && refp != NULL; refp=refp->next) { + if ( refp->server ) + cellp = refp->server->cellp; + } + } + if (cellp == NULL && fidp) { + cellp = cm_FindCellByID(fidp->cell); + } + } + if (errorCode == CM_ERROR_TIMEDOUT) { if (timeLeft > 5 ) { thrd_Sleep(3000); cm_CheckServers(CM_FLAG_CHECKDOWNSERVERS, cellp); retry = 1; } *************** *** 253,327 **** } else if (errorCode == CM_ERROR_ALLOFFLINE) { ! if (timeLeft > 7) { ! osi_Log0(afsd_logp, "cm_Analyze passed CM_ERROR_ALLOFFLINE."); thrd_Sleep(5000); - - if (fidp) { /* Not a VLDB call */ - if (!serversp) { - code = cm_GetServerList(fidp, userp, reqp, &serverspp); - if (code == 0) { - serversp = *serverspp; - free_svr_list = 1; - } - } - if (serversp) { - lock_ObtainWrite(&cm_serverLock); - for (tsrp = serversp; tsrp; tsrp=tsrp->next) - tsrp->status = not_busy; - lock_ReleaseWrite(&cm_serverLock); - if (free_svr_list) { - cm_FreeServerList(&serversp); - *serverspp = serversp; - } - retry = 1; - } ! cm_ForceUpdateVolume(fidp, userp, reqp); ! } else { /* VLDB call */ ! if (serversp) { ! lock_ObtainWrite(&cm_serverLock); ! for (tsrp = serversp; tsrp; tsrp=tsrp->next) ! tsrp->status = not_busy; ! lock_ReleaseWrite(&cm_serverLock); ! if (free_svr_list) { ! cm_FreeServerList(&serversp); ! *serverspp = serversp; ! } ! } ! } } } - - /* if all servers are busy, mark them non-busy and start over */ else if (errorCode == CM_ERROR_ALLBUSY) { osi_Log0(afsd_logp, "cm_Analyze passed CM_ERROR_ALLBUSY."); if (timeLeft > 7) { thrd_Sleep(5000); ! if (!serversp) { ! code = cm_GetServerList(fidp, userp, reqp, &serverspp); if (code == 0) { ! serversp = *serverspp; ! free_svr_list = 1; } } - lock_ObtainWrite(&cm_serverLock); - for (tsrp = serversp; tsrp; tsrp=tsrp->next) { - if (tsrp->status == busy) - tsrp->status = not_busy; - } - lock_ReleaseWrite(&cm_serverLock); - if (free_svr_list) { - cm_FreeServerList(&serversp); - *serverspp = serversp; - } - retry = 1; } } /* special codes: VBUSY and VRESTARTING */ else if (errorCode == VBUSY || errorCode == VRESTARTING) { ! if (!serversp) { code = cm_GetServerList(fidp, userp, reqp, &serverspp); if (code == 0) { serversp = *serverspp; --- 264,368 ---- } else if (errorCode == CM_ERROR_ALLOFFLINE) { ! osi_Log0(afsd_logp, "cm_Analyze passed CM_ERROR_ALLOFFLINE."); ! /* Volume instances marked offline will be restored by the ! * background daemon thread as they become available ! */ ! if (timeLeft > 7 && fidp) { ! cm_volume_t *volp; ! cm_vol_state_t *statep; ! thrd_Sleep(5000); ! code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, ! CM_GETVOL_FLAG_NO_LRU_UPDATE, ! &volp); ! if (code == 0) { ! if (fidp->volume == volp->rw.ID) ! statep = &volp->rw; ! else if (fidp->volume == volp->ro.ID) ! statep = &volp->ro; ! else if (fidp->volume == volp->bk.ID) ! statep = &volp->bk; ! ! if (statep->state != vl_offline) { ! retry = 1; ! } else { ! if (cm_CheckOfflineVolume(volp, statep->ID)) ! retry = 1; ! } ! ! cm_PutVolume(volp); ! } } } else if (errorCode == CM_ERROR_ALLBUSY) { + /* Volumes that are busy cannot be determined to be non-busy + * without actually attempting to access them. + */ osi_Log0(afsd_logp, "cm_Analyze passed CM_ERROR_ALLBUSY."); if (timeLeft > 7) { + thrd_Sleep(5000); ! ! if (fidp) { /* File Server query */ ! code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, ! CM_GETVOL_FLAG_NO_LRU_UPDATE, ! &volp); if (code == 0) { ! if (fidp->volume == volp->rw.ID) ! statep = &volp->rw; ! else if (fidp->volume == volp->ro.ID) ! statep = &volp->ro; ! else if (fidp->volume == volp->bk.ID) ! statep = &volp->bk; ! ! if (statep->state != vl_offline && statep->state != vl_busy) { ! retry = 1; ! } else { ! if (!serversp) { ! code = cm_GetServerList(fidp, userp, reqp, &serverspp); ! if (code == 0) { ! serversp = *serverspp; ! free_svr_list = 1; ! } ! } ! lock_ObtainWrite(&cm_serverLock); ! for (tsrp = serversp; tsrp; tsrp=tsrp->next) { ! if (tsrp->status == srv_busy) { ! tsrp->status = srv_not_busy; ! } ! } ! lock_ReleaseWrite(&cm_serverLock); ! if (free_svr_list) { ! cm_FreeServerList(&serversp, 0); ! *serverspp = serversp; ! } ! ! cm_UpdateVolumeStatus(volp, statep->ID); ! retry = 1; ! } ! ! cm_PutVolume(volp); ! } ! } else { /* VL Server query */ ! if (serversp) { ! lock_ObtainWrite(&cm_serverLock); ! for (tsrp = serversp; tsrp; tsrp=tsrp->next) { ! if (tsrp->status == srv_busy) { ! tsrp->status = srv_not_busy; ! } ! } ! lock_ReleaseWrite(&cm_serverLock); ! retry = 1; } } } } /* special codes: VBUSY and VRESTARTING */ else if (errorCode == VBUSY || errorCode == VRESTARTING) { ! if (!serversp && fidp) { code = cm_GetServerList(fidp, userp, reqp, &serverspp); if (code == 0) { serversp = *serverspp; *************** *** 330,344 **** } lock_ObtainWrite(&cm_serverLock); for (tsrp = serversp; tsrp; tsrp=tsrp->next) { ! if (tsrp->server == serverp ! && tsrp->status == not_busy) { ! tsrp->status = busy; break; } } lock_ReleaseWrite(&cm_serverLock); if (free_svr_list) { ! cm_FreeServerList(&serversp); *serverspp = serversp; } retry = 1; --- 371,403 ---- } lock_ObtainWrite(&cm_serverLock); for (tsrp = serversp; tsrp; tsrp=tsrp->next) { ! if (tsrp->server == serverp && tsrp->status == srv_not_busy) { ! tsrp->status = srv_busy; ! if (fidp) { /* File Server query */ ! code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, ! CM_GETVOL_FLAG_NO_LRU_UPDATE, ! &volp); ! if (code == 0) { ! if (fidp->volume == volp->rw.ID) ! statep = &volp->rw; ! else if (fidp->volume == volp->ro.ID) ! statep = &volp->ro; ! else if (fidp->volume == volp->bk.ID) ! statep = &volp->bk; ! } ! ! cm_PutVolume(volp); ! } break; } } lock_ReleaseWrite(&cm_serverLock); + + if (statep) + cm_UpdateVolumeStatus(volp, statep->ID); + if (free_svr_list) { ! cm_FreeServerList(&serversp, 0); *serverspp = serversp; } retry = 1; *************** *** 405,411 **** #endif /* Mark server offline for this volume */ ! if (!serversp) { code = cm_GetServerList(fidp, userp, reqp, &serverspp); if (code == 0) { serversp = *serverspp; --- 464,470 ---- #endif /* Mark server offline for this volume */ ! if (!serversp && fidp) { code = cm_GetServerList(fidp, userp, reqp, &serverspp); if (code == 0) { serversp = *serverspp; *************** *** 413,423 **** } } for (tsrp = serversp; tsrp; tsrp=tsrp->next) { ! if (tsrp->server == serverp) ! tsrp->status = offline; } if (free_svr_list) { ! cm_FreeServerList(&serversp); *serverspp = serversp; } if ( timeLeft > 2 ) --- 472,490 ---- } } for (tsrp = serversp; tsrp; tsrp=tsrp->next) { ! if (tsrp->server == serverp) { ! /* REDIRECT */ ! if (errorCode == VNOVOL || errorCode == VMOVED) { ! tsrp->status = srv_deleted; ! if (fidp) { ! cm_ForceUpdateVolume(fidp, userp, reqp); ! } ! } else ! tsrp->status = srv_offline; ! } } if (free_svr_list) { ! cm_FreeServerList(&serversp, 0); *serverspp = serversp; } if ( timeLeft > 2 ) *************** *** 666,675 **** lock_ReleaseWrite(&cm_serverLock); if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { allDown = 0; ! if (tsrp->status == busy) { allOffline = 0; someBusy = 1; ! } else if (tsrp->status == offline) { allBusy = 0; someOffline = 1; } else { --- 733,744 ---- lock_ReleaseWrite(&cm_serverLock); if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { allDown = 0; ! if (tsrp->status == srv_deleted) { ! /* skip this entry. no longer valid. */; ! } else if (tsrp->status == srv_busy) { allOffline = 0; someBusy = 1; ! } else if (tsrp->status == srv_offline) { allBusy = 0; someOffline = 1; } else { *************** *** 870,879 **** cm_GetServerNoLock(tsp); if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { allDown = 0; ! if (tsrp->status == busy) { allOffline = 0; someBusy = 1; ! } else if (tsrp->status == offline) { allBusy = 0; someOffline = 1; } else { --- 939,948 ---- cm_GetServerNoLock(tsp); if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { allDown = 0; ! if (tsrp->status == srv_busy) { allOffline = 0; someBusy = 1; ! } else if (tsrp->status == srv_offline) { allBusy = 0; someOffline = 1; } else { *************** *** 884,890 **** cm_PutServerNoLock(tsp); } lock_ReleaseWrite(&cm_serverLock); ! cm_FreeServerList(serverspp); if (allDown) return 0; --- 953,959 ---- cm_PutServerNoLock(tsp); } lock_ReleaseWrite(&cm_serverLock); ! cm_FreeServerList(serverspp, 0); if (allDown) return 0; *************** *** 896,919 **** return 1; } ! long cm_Conn(struct cm_fid *fidp, struct cm_user *userp, cm_req_t *reqp, ! cm_conn_t **connpp) { long code; cm_serverRef_t **serverspp; code = cm_GetServerList(fidp, userp, reqp, &serverspp); if (code) { - *connpp = NULL; return code; } code = cm_ConnByMServers(*serverspp, userp, reqp, connpp); ! cm_FreeServerList(serverspp); return code; } ! extern struct rx_connection * cm_GetRxConn(cm_conn_t *connp) { struct rx_connection * rxconn; --- 965,1010 ---- return 1; } ! /* ! * The returned cm_conn_t ** object is released in the subsequent call ! * to cm_Analyze(). ! */ ! long cm_ConnFromFID(struct cm_fid *fidp, struct cm_user *userp, cm_req_t *reqp, ! cm_conn_t **connpp) { long code; cm_serverRef_t **serverspp; + *connpp = NULL; + code = cm_GetServerList(fidp, userp, reqp, &serverspp); if (code) { return code; } code = cm_ConnByMServers(*serverspp, userp, reqp, connpp); ! cm_FreeServerList(serverspp, 0); ! return code; ! } ! ! ! long cm_ConnFromVolume(struct cm_volume *volp, unsigned long volid, struct cm_user *userp, cm_req_t *reqp, ! cm_conn_t **connpp) ! { ! long code; ! cm_serverRef_t **serverspp; ! ! *connpp = NULL; ! ! serverspp = cm_GetVolServers(volp, volid); ! ! code = cm_ConnByMServers(*serverspp, userp, reqp, connpp); ! cm_FreeServerList(serverspp, 0); return code; } ! ! extern struct rx_connection * cm_GetRxConn(cm_conn_t *connp) { struct rx_connection * rxconn; Index: openafs/src/WINNT/afsd/cm_conn.h diff -c openafs/src/WINNT/afsd/cm_conn.h:1.13.4.7 openafs/src/WINNT/afsd/cm_conn.h:1.13.4.8 *** openafs/src/WINNT/afsd/cm_conn.h:1.13.4.7 Sat Mar 10 10:50:07 2007 --- openafs/src/WINNT/afsd/cm_conn.h Sun Jun 10 13:00:07 2007 *************** *** 113,121 **** extern long cm_ConnByServer(struct cm_server *, struct cm_user *, cm_conn_t **); ! extern long cm_Conn(struct cm_fid *, struct cm_user *, struct cm_req *, cm_conn_t **); extern void cm_PutConn(cm_conn_t *connp); extern void cm_GCConnections(cm_server_t *serverp); --- 113,125 ---- extern long cm_ConnByServer(struct cm_server *, struct cm_user *, cm_conn_t **); ! extern long cm_ConnFromFID(struct cm_fid *, struct cm_user *, struct cm_req *, cm_conn_t **); + extern long cm_ConnFromVolume(struct cm_volume *volp, unsigned long volid, + struct cm_user *userp, cm_req_t *reqp, + cm_conn_t **connpp); + extern void cm_PutConn(cm_conn_t *connp); extern void cm_GCConnections(cm_server_t *serverp); Index: openafs/src/WINNT/afsd/cm_daemon.c diff -c openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.11 openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.16 *** openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.11 Sat Mar 10 10:50:07 2007 --- openafs/src/WINNT/afsd/cm_daemon.c Thu Jul 5 15:22:15 2007 *************** *** 36,41 **** --- 36,42 ---- long cm_daemonCheckCBInterval = 60; long cm_daemonCheckLockInterval = 60; long cm_daemonTokenCheckInterval = 180; + long cm_daemonCheckOfflineVolInterval = 600; osi_rwlock_t cm_daemonLock; *************** *** 58,68 **** while (daemon_ShutdownFlag == 0) { DWORD Result = NotifyAddrChange(NULL,NULL); if (Result == NO_ERROR && daemon_ShutdownFlag == 0) { - osi_Log0(afsd_logp, "cm_IpAddrDaemon CheckDownServers"); Sleep(2500); cm_ForceNewConnectionsAllServers(); ! cm_CheckServers(CM_FLAG_CHECKUPSERVERS | CM_FLAG_CHECKDOWNSERVERS, NULL); smb_CheckVCs(); } } } --- 59,71 ---- while (daemon_ShutdownFlag == 0) { DWORD Result = NotifyAddrChange(NULL,NULL); if (Result == NO_ERROR && daemon_ShutdownFlag == 0) { Sleep(2500); + osi_Log0(afsd_logp, "cm_IpAddrDaemon CheckDownServers"); + cm_CheckServers(CM_FLAG_CHECKVLDBSERVERS | CM_FLAG_CHECKUPSERVERS | CM_FLAG_CHECKDOWNSERVERS, NULL); cm_ForceNewConnectionsAllServers(); ! cm_CheckServers(CM_FLAG_CHECKFILESERVERS | CM_FLAG_CHECKUPSERVERS | CM_FLAG_CHECKDOWNSERVERS, NULL); smb_CheckVCs(); + cm_VolStatus_Network_Addr_Change(); } } } *************** *** 244,283 **** return; dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "DownServerCheckInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckDownInterval = dummy; ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "UpServerCheckInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckUpInterval = dummy; ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "VolumeCheckInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckVolInterval = dummy; ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "CallbackCheckInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckCBInterval = dummy; ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "LockCheckInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckLockInterval = dummy; ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "TokenCheckInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonTokenCheckInterval = dummy; RegCloseKey(parmKey); } --- 247,299 ---- return; dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "daemonCheckDownInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckDownInterval = dummy; ! afsi_log("daemonCheckDownInterval is %d", cm_daemonCheckDownInterval); ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "daemonCheckUpInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckUpInterval = dummy; ! afsi_log("daemonCheckUpInterval is %d", cm_daemonCheckUpInterval); ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "daemonCheckVolInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckVolInterval = dummy; ! afsi_log("daemonCheckVolInterval is %d", cm_daemonCheckVolInterval); ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "daemonCheckCBInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckCBInterval = dummy; ! afsi_log("daemonCheckCBInterval is %d", cm_daemonCheckCBInterval); ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "daemonCheckLockInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonCheckLockInterval = dummy; ! afsi_log("daemonCheckLockInterval is %d", cm_daemonCheckLockInterval); ! dummyLen = sizeof(DWORD); ! code = RegQueryValueEx(parmKey, "daemonCheckTokenInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); if (code == ERROR_SUCCESS) cm_daemonTokenCheckInterval = dummy; + afsi_log("daemonCheckTokenInterval is %d", cm_daemonTokenCheckInterval); + + dummyLen = sizeof(DWORD); + code = RegQueryValueEx(parmKey, "daemonCheckOfflineVolInterval", NULL, NULL, + (BYTE *) &dummy, &dummyLen); + if (code == ERROR_SUCCESS) + cm_daemonCheckOfflineVolInterval = dummy; + afsi_log("daemonCheckOfflineVolInterval is %d", cm_daemonCheckOfflineVolInterval); RegCloseKey(parmKey); } *************** *** 292,297 **** --- 308,314 ---- time_t lastDownServerCheck; time_t lastUpServerCheck; time_t lastTokenCacheCheck; + time_t lastBusyVolCheck; char thostName[200]; unsigned long code; struct hostent *thp; *************** *** 331,336 **** --- 348,354 ---- lastDownServerCheck = now - cm_daemonCheckDownInterval/2 + (rand() % cm_daemonCheckDownInterval); lastUpServerCheck = now - cm_daemonCheckUpInterval/2 + (rand() % cm_daemonCheckUpInterval); lastTokenCacheCheck = now - cm_daemonTokenCheckInterval/2 + (rand() % cm_daemonTokenCheckInterval); + lastBusyVolCheck = now - cm_daemonCheckOfflineVolInterval/2 * (rand() % cm_daemonCheckOfflineVolInterval); while (daemon_ShutdownFlag == 0) { /* check to see if the listener threads halted due to network *************** *** 384,389 **** --- 402,413 ---- now = osi_Time(); } + if (now > lastBusyVolCheck + cm_daemonCheckOfflineVolInterval) { + lastVolCheck = now; + cm_CheckOfflineVolumes(); + now = osi_Time(); + } + if (now > lastCBExpirationCheck + cm_daemonCheckCBInterval) { lastCBExpirationCheck = now; cm_CheckCBExpiration(); Index: openafs/src/WINNT/afsd/cm_dcache.c diff -c openafs/src/WINNT/afsd/cm_dcache.c:1.30.2.14 openafs/src/WINNT/afsd/cm_dcache.c:1.30.2.15 *** openafs/src/WINNT/afsd/cm_dcache.c:1.30.2.14 Wed Feb 7 12:35:16 2007 --- openafs/src/WINNT/afsd/cm_dcache.c Sun Jun 10 13:00:07 2007 *************** *** 149,155 **** /* now we're ready to do the store operation */ do { ! code = cm_Conn(&scp->fid, userp, reqp, &connp); if (code) continue; --- 149,155 ---- /* now we're ready to do the store operation */ do { ! code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp); if (code) continue; *************** *** 356,362 **** /* now we're ready to do the store operation */ do { ! code = cm_Conn(&scp->fid, userp, reqp, &connp); if (code) continue; --- 356,362 ---- /* now we're ready to do the store operation */ do { ! code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp); if (code) continue; *************** *** 1429,1435 **** /* now make the call */ do { ! code = cm_Conn(&scp->fid, up, reqp, &connp); if (code) continue; --- 1429,1435 ---- /* now make the call */ do { ! code = cm_ConnFromFID(&scp->fid, up, reqp, &connp); if (code) continue; Index: openafs/src/WINNT/afsd/cm_dns.c diff -c openafs/src/WINNT/afsd/cm_dns.c:1.12 openafs/src/WINNT/afsd/cm_dns.c:1.12.4.1 *** openafs/src/WINNT/afsd/cm_dns.c:1.12 Sat Nov 5 01:47:46 2005 --- openafs/src/WINNT/afsd/cm_dns.c Mon Jul 2 20:35:13 2007 *************** *** 707,712 **** --- 707,717 ---- struct sockaddr_in vlSockAddr; char query[1024]; + #ifdef AFS_FREELANCE_CLIENT + if ( stricmp(cellName, "Freelance.Local.Root") == 0 ) + return -1; + #endif /* AFS_FREELANCE_CLIENT */ + *numServers = 0; *ttl = 0; Index: openafs/src/WINNT/afsd/cm_freelance.c diff -c openafs/src/WINNT/afsd/cm_freelance.c:1.33.2.1 openafs/src/WINNT/afsd/cm_freelance.c:1.33.2.2 *** openafs/src/WINNT/afsd/cm_freelance.c:1.33.2.1 Sat Jun 24 16:41:54 2006 --- openafs/src/WINNT/afsd/cm_freelance.c Sun Jun 10 13:00:07 2007 *************** *** 157,163 **** cm_data.fakeDirVersion = cm_data.rootSCachep->dataVersion; // yj: first we make a call to cm_initLocalMountPoints ! // to read all the local mount points from an ini file cm_InitLocalMountPoints(); // then we make a call to InitFakeRootDir to create --- 157,163 ---- cm_data.fakeDirVersion = cm_data.rootSCachep->dataVersion; // yj: first we make a call to cm_initLocalMountPoints ! // to read all the local mount points from the registry cm_InitLocalMountPoints(); // then we make a call to InitFakeRootDir to create *************** *** 358,364 **** int cm_FakeRootFid(cm_fid_t *fidp) { fidp->cell = AFS_FAKE_ROOT_CELL_ID; /* root cell */ ! fidp->volume = AFS_FAKE_ROOT_VOL_ID; /* root.afs ? */ fidp->vnode = 0x1; fidp->unique = 0x1; return 0; --- 358,364 ---- int cm_FakeRootFid(cm_fid_t *fidp) { fidp->cell = AFS_FAKE_ROOT_CELL_ID; /* root cell */ ! fidp->volume = AFS_FAKE_ROOT_VOL_ID; /* root.afs ? */ fidp->vnode = 0x1; fidp->unique = 0x1; return 0; *************** *** 404,410 **** lock_ObtainMutex(&cm_Freelance_Lock); /* always scache then freelance lock */ for (i=0; inextp) { if (scp->fid.volume == aFid.volume && scp->fid.vnode == aFid.vnode && scp->fid.unique == aFid.unique --- 404,410 ---- lock_ObtainMutex(&cm_Freelance_Lock); /* always scache then freelance lock */ for (i=0; inextp) { if (scp->fid.volume == aFid.volume && scp->fid.vnode == aFid.vnode && scp->fid.unique == aFid.unique *************** *** 421,427 **** cm_ReleaseSCacheNoLock(scp); // take the scp out of the hash ! for (lscpp = &cm_data.hashTablep[hash], tscp = cm_data.hashTablep[hash]; tscp; lscpp = &tscp->nextp, tscp = tscp->nextp) { if (tscp == scp) { --- 421,427 ---- cm_ReleaseSCacheNoLock(scp); // take the scp out of the hash ! for (lscpp = &cm_data.scacheHashTablep[hash], tscp = cm_data.scacheHashTablep[hash]; tscp; lscpp = &tscp->nextp, tscp = tscp->nextp) { if (tscp == scp) { *************** *** 467,473 **** } ! // yj: open up the ini file and read all the local mount // points that are stored there. Part of the initialization // process for the freelance client. /* to be called while holding freelance lock unless during init. */ --- 467,473 ---- } ! // yj: open up the registry and read all the local mount // points that are stored there. Part of the initialization // process for the freelance client. /* to be called while holding freelance lock unless during init. */ *************** *** 518,524 **** if (code == 0) { cm_FreelanceAddMount(&rootCellName[1], &rootCellName[1], "root.cell.", 0, NULL); cm_FreelanceAddMount(rootCellName, &rootCellName[1], "root.cell.", 1, NULL); ! dwMountPoints = 2; } } --- 518,525 ---- if (code == 0) { cm_FreelanceAddMount(&rootCellName[1], &rootCellName[1], "root.cell.", 0, NULL); cm_FreelanceAddMount(rootCellName, &rootCellName[1], "root.cell.", 1, NULL); ! cm_FreelanceAddMount(".root", &rootCellName[1], "root.afs.", 1, NULL); ! dwMountPoints = 3; } } *************** *** 719,724 **** --- 720,726 ---- if (code == 0) { cm_FreelanceAddMount(&rootCellName[1], &rootCellName[1], "root.cell.", 0, NULL); cm_FreelanceAddMount(rootCellName, &rootCellName[1], "root.cell.", 1, NULL); + cm_FreelanceAddMount(".root", &rootCellName[1], "root.afs.", 1, NULL); } return 0; } Index: openafs/src/WINNT/afsd/cm_ioctl.c diff -c openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.12 openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.18 *** openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.12 Sat Apr 14 14:49:36 2007 --- openafs/src/WINNT/afsd/cm_ioctl.c Sat Jun 30 00:44:23 2007 *************** *** 32,38 **** #include #include "smb.h" - #include "cm_server.h" #ifndef DJGPP #include --- 32,37 ---- *************** *** 137,144 **** #endif lock_ObtainWrite(&cm_scacheLock); ! for (i=0; inextp) { if (scp->fid.volume == volume && scp->fid.cell == cell) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); --- 136,143 ---- #endif lock_ObtainWrite(&cm_scacheLock); ! for (i=0; inextp) { if (scp->fid.volume == volume && scp->fid.cell == cell) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); *************** *** 165,172 **** int hash; lock_ObtainWrite(&cm_scacheLock); ! for (hash=0; hash < cm_data.hashTableSize; hash++) { ! for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); lock_ObtainMutex(&scp->mx); --- 164,171 ---- int hash; lock_ObtainWrite(&cm_scacheLock); ! for (hash=0; hash < cm_data.scacheHashTableSize; hash++) { ! for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); lock_ObtainMutex(&scp->mx); *************** *** 238,244 **** and it returns the correct (full) path. therefore, there is no drive letter, and the path is absolute. */ code = cm_NameI(cm_data.rootSCachep, relativePath, ! CM_FLAG_CASEFOLD | CM_FLAG_FOLLOW, userp, "", reqp, scpp); if (code) { --- 237,243 ---- and it returns the correct (full) path. therefore, there is no drive letter, and the path is absolute. */ code = cm_NameI(cm_data.rootSCachep, relativePath, ! CM_FLAG_CASEFOLD, userp, "", reqp, scpp); if (code) { *************** *** 332,338 **** return code; } ! code = cm_NameI(substRootp, relativePath, CM_FLAG_CASEFOLD | CM_FLAG_FOLLOW, userp, NULL, reqp, scpp); if (code) { cm_ReleaseSCache(substRootp); --- 331,338 ---- return code; } ! code = cm_NameI(substRootp, relativePath, ! CM_FLAG_CASEFOLD, userp, NULL, reqp, scpp); if (code) { cm_ReleaseSCache(substRootp); *************** *** 543,549 **** do { acl.AFSOpaque_val = ioctlp->outDatap; acl.AFSOpaque_len = 0; ! code = cm_Conn(&scp->fid, userp, &req, &connp); if (code) continue; callp = cm_GetRxConn(connp); --- 543,549 ---- do { acl.AFSOpaque_val = ioctlp->outDatap; acl.AFSOpaque_len = 0; ! code = cm_ConnFromFID(&scp->fid, userp, &req, &connp); if (code) continue; callp = cm_GetRxConn(connp); *************** *** 625,631 **** do { acl.AFSOpaque_val = ioctlp->inDatap; acl.AFSOpaque_len = (u_int)strlen(ioctlp->inDatap)+1; ! code = cm_Conn(&scp->fid, userp, &req, &connp); if (code) continue; callp = cm_GetRxConn(connp); --- 625,631 ---- do { acl.AFSOpaque_val = ioctlp->inDatap; acl.AFSOpaque_len = (u_int)strlen(ioctlp->inDatap)+1; ! code = cm_ConnFromFID(&scp->fid, userp, &req, &connp); if (code) continue; callp = cm_GetRxConn(connp); *************** *** 657,664 **** cm_InitReq(&req); lock_ObtainWrite(&cm_scacheLock); ! for (i=0; inextp) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); --- 657,664 ---- cm_InitReq(&req); lock_ObtainWrite(&cm_scacheLock); ! for (i=0; inextp) { cm_HoldSCacheNoLock(scp); lock_ReleaseWrite(&cm_scacheLock); *************** *** 741,747 **** return CM_ERROR_READONLY; } ! code = cm_GetVolumeByID(cellp, scp->fid.volume, userp, &req, &tvp); if (code) { cm_ReleaseSCache(scp); return code; --- 741,748 ---- return CM_ERROR_READONLY; } ! code = cm_GetVolumeByID(cellp, scp->fid.volume, userp, &req, ! CM_GETVOL_FLAG_CREATE, &tvp); if (code) { cm_ReleaseSCache(scp); return code; *************** *** 768,774 **** } do { ! code = cm_Conn(&scp->fid, userp, &req, &tcp); if (code) continue; callp = cm_GetRxConn(tcp); --- 769,775 ---- } do { ! code = cm_ConnFromFID(&scp->fid, userp, &req, &tcp); if (code) continue; callp = cm_GetRxConn(tcp); *************** *** 811,817 **** cm_scache_t *scp; char offLineMsg[256]; char motd[256]; ! cm_conn_t *tcp; register long code; AFSFetchVolumeStatus volStat; register char *cp; --- 812,818 ---- cm_scache_t *scp; char offLineMsg[256]; char motd[256]; ! cm_conn_t *connp; register long code; AFSFetchVolumeStatus volStat; register char *cp; *************** *** 830,844 **** OfflineMsg = offLineMsg; MOTD = motd; do { ! code = cm_Conn(&scp->fid, userp, &req, &tcp); if (code) continue; ! callp = cm_GetRxConn(tcp); code = RXAFS_GetVolumeStatus(callp, scp->fid.volume, &volStat, &Name, &OfflineMsg, &MOTD); rx_PutConnection(callp); ! } while (cm_Analyze(tcp, userp, &req, &scp->fid, NULL, NULL, NULL, code)); code = cm_MapRPCError(code, &req); cm_ReleaseSCache(scp); --- 831,845 ---- OfflineMsg = offLineMsg; MOTD = motd; do { ! code = cm_ConnFromFID(&scp->fid, userp, &req, &connp); if (code) continue; ! callp = cm_GetRxConn(connp); code = RXAFS_GetVolumeStatus(callp, scp->fid.volume, &volStat, &Name, &OfflineMsg, &MOTD); rx_PutConnection(callp); ! } while (cm_Analyze(connp, userp, &req, &scp->fid, NULL, NULL, NULL, code)); code = cm_MapRPCError(code, &req); cm_ReleaseSCache(scp); *************** *** 945,951 **** if (!cellp) return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, volume, userp, &req, &tvp); if (code) return code; cp = ioctlp->outDatap; --- 946,952 ---- if (!cellp) return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp); if (code) return code; cp = ioctlp->outDatap; *************** *** 959,965 **** cp += sizeof(long); } lock_ReleaseRead(&cm_serverLock); ! cm_FreeServerList(tsrpp); lock_ReleaseMutex(&tvp->mx); /* still room for terminating NULL, add it on */ --- 960,966 ---- cp += sizeof(long); } lock_ReleaseRead(&cm_serverLock); ! cm_FreeServerList(tsrpp, 0); lock_ReleaseMutex(&tvp->mx); /* still room for terminating NULL, add it on */ *************** *** 1267,1273 **** } lock_ObtainRead(&cm_cellLock); ! for (tcellp = cm_data.allCellsp; tcellp; tcellp = tcellp->nextp) { if (whichCell == 0) break; whichCell--; } --- 1268,1274 ---- } lock_ObtainRead(&cm_cellLock); ! for (tcellp = cm_data.allCellsp; tcellp; tcellp = tcellp->allNextp) { if (whichCell == 0) break; whichCell--; } *************** *** 1324,1335 **** cm_SkipIoctlPath(ioctlp); lock_ObtainWrite(&cm_cellLock); ! for (cp = cm_data.allCellsp; cp; cp=cp->nextp) { long code; lock_ObtainMutex(&cp->mx); /* delete all previous server lists - cm_FreeServerList will ask for write on cm_ServerLock*/ ! cm_FreeServerList(&cp->vlServersp); cp->vlServersp = NULL; code = cm_SearchCellFile(cp->name, cp->name, cm_AddCellProc, cp); #ifdef AFS_AFSDB_ENV --- 1325,1336 ---- cm_SkipIoctlPath(ioctlp); lock_ObtainWrite(&cm_cellLock); ! for (cp = cm_data.allCellsp; cp; cp=cp->allNextp) { long code; lock_ObtainMutex(&cp->mx); /* delete all previous server lists - cm_FreeServerList will ask for write on cm_ServerLock*/ ! cm_FreeServerList(&cp->vlServersp, CM_FREESERVERLIST_DELETE); cp->vlServersp = NULL; code = cm_SearchCellFile(cp->name, cp->name, cm_AddCellProc, cp); #ifdef AFS_AFSDB_ENV *************** *** 2755,2762 **** #endif /* dump all interesting data */ ! cm_DumpSCache(hLogFile, cookie, 1); cm_DumpVolumes(hLogFile, cookie, 1); cm_DumpBufHashTable(hLogFile, cookie, 1); smb_DumpVCP(hLogFile, cookie, 1); --- 2756,2764 ---- #endif /* dump all interesting data */ ! cm_DumpCells(hLogFile, cookie, 1); cm_DumpVolumes(hLogFile, cookie, 1); + cm_DumpSCache(hLogFile, cookie, 1); cm_DumpBufHashTable(hLogFile, cookie, 1); smb_DumpVCP(hLogFile, cookie, 1); *************** *** 2790,2799 **** lock_ReleaseRead(&cm_serverLock); if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { allDown = 0; ! if (tsrp->status == busy) { allOffline = 0; someBusy = 1; ! } else if (tsrp->status == offline) { allBusy = 0; someOffline = 1; } else { --- 2792,2801 ---- lock_ReleaseRead(&cm_serverLock); if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { allDown = 0; ! if (tsrp->status == srv_busy) { allOffline = 0; someBusy = 1; ! } else if (tsrp->status == srv_offline) { allBusy = 0; someOffline = 1; } else { *************** *** 2828,2835 **** cm_scache_t *scp; cm_cell_t *cellp; cm_volume_t *tvp; ! cm_serverRef_t **tsrpp; ! unsigned long volume; cm_req_t req; cm_InitReq(&req); --- 2830,2837 ---- cm_scache_t *scp; cm_cell_t *cellp; cm_volume_t *tvp; ! cm_vol_state_t *statep; ! afs_uint32 volume; cm_req_t req; cm_InitReq(&req); *************** *** 2847,2863 **** if (!cellp) return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, volume, userp, &req, &tvp); if (code) return code; ! lock_ObtainMutex(&tvp->mx); ! tsrpp = cm_GetVolServers(tvp, volume); ! code = cm_CheckServersStatus(*tsrpp); ! cm_FreeServerList(tsrpp); ! lock_ReleaseMutex(&tvp->mx); cm_PutVolume(tvp); ! return 0; } --- 2849,2882 ---- if (!cellp) return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp); if (code) return code; ! if (volume == tvp->rw.ID) ! statep = &tvp->rw; ! else if (volume == tvp->ro.ID) ! statep = &tvp->ro; ! else ! statep = &tvp->bk; ! ! switch (statep->state) { ! case vl_online: ! case vl_unknown: ! code = 0; ! break; ! case vl_busy: ! code = CM_ERROR_ALLBUSY; ! break; ! case vl_offline: ! code = CM_ERROR_ALLOFFLINE; ! break; ! case vl_alldown: ! code = CM_ERROR_ALLDOWN; ! break; ! } cm_PutVolume(tvp); ! return code; } Index: openafs/src/WINNT/afsd/cm_memmap.c diff -c openafs/src/WINNT/afsd/cm_memmap.c:1.7.2.4 openafs/src/WINNT/afsd/cm_memmap.c:1.7.2.6 *** openafs/src/WINNT/afsd/cm_memmap.c:1.7.2.4 Sun Feb 4 22:41:41 2007 --- openafs/src/WINNT/afsd/cm_memmap.c Fri Jun 22 18:16:39 2007 *************** *** 39,44 **** --- 39,60 ---- } afs_uint64 + ComputeSizeOfCellHT(DWORD maxcells) + { + afs_uint64 size; + size = osi_PrimeLessThan((afs_uint32)(maxcells/7 + 1)) * sizeof(cm_cell_t *); + return size; + } + + afs_uint64 + ComputeSizeOfVolumeHT(DWORD maxvols) + { + afs_uint64 size; + size = osi_PrimeLessThan((afs_uint32)(maxvols/7 + 1)) * sizeof(cm_volume_t *); + return size; + } + + afs_uint64 ComputeSizeOfCells(DWORD maxcells) { afs_uint64 size; *************** *** 66,72 **** ComputeSizeOfSCacheHT(DWORD stats) { afs_uint64 size; ! size = (stats + 10) / 2 * sizeof(cm_scache_t *);; return size; } --- 82,88 ---- ComputeSizeOfSCacheHT(DWORD stats) { afs_uint64 size; ! size = osi_PrimeLessThan(stats / 2 + 1) * sizeof(cm_scache_t *);; return size; } *************** *** 109,115 **** --- 125,133 ---- size = ComputeSizeOfConfigData() + ComputeSizeOfVolumes(maxVols) + + 4 * ComputeSizeOfVolumeHT(maxVols) + ComputeSizeOfCells(maxCells) + + 2 * ComputeSizeOfCellHT(maxCells) + ComputeSizeOfACLCache(stats) + ComputeSizeOfSCache(stats) + ComputeSizeOfSCacheHT(stats) *************** *** 221,231 **** afsi_log(" blockSize = %d", cm_data.blockSize); afsi_log(" bufferSize = %d", cm_data.bufferSize); afsi_log(" cacheType = %d", cm_data.cacheType); afsi_log(" currentVolumes = %d", cm_data.currentVolumes); afsi_log(" maxVolumes = %d", cm_data.maxVolumes); afsi_log(" currentCells = %d", cm_data.currentCells); afsi_log(" maxCells = %d", cm_data.maxCells); ! afsi_log(" hashTableSize = %d", cm_data.hashTableSize); afsi_log(" currentSCaches = %d", cm_data.currentSCaches); afsi_log(" maxSCaches = %d", cm_data.maxSCaches); --- 239,251 ---- afsi_log(" blockSize = %d", cm_data.blockSize); afsi_log(" bufferSize = %d", cm_data.bufferSize); afsi_log(" cacheType = %d", cm_data.cacheType); + afsi_log(" volumeHashTableSize = %d", cm_data.volumeHashTableSize); afsi_log(" currentVolumes = %d", cm_data.currentVolumes); afsi_log(" maxVolumes = %d", cm_data.maxVolumes); + afsi_log(" cellHashTableSize = %d", cm_data.cellHashTableSize); afsi_log(" currentCells = %d", cm_data.currentCells); afsi_log(" maxCells = %d", cm_data.maxCells); ! afsi_log(" scacheHashTableSize = %d", cm_data.scacheHashTableSize); afsi_log(" currentSCaches = %d", cm_data.currentSCaches); afsi_log(" maxSCaches = %d", cm_data.maxSCaches); *************** *** 404,414 **** fprintf(stderr," blockSize = %d\n", config_data_p->blockSize); fprintf(stderr," bufferSize = %d\n", config_data_p->bufferSize); fprintf(stderr," cacheType = %d\n", config_data_p->cacheType); fprintf(stderr," currentVolumes = %d\n", config_data_p->currentVolumes); fprintf(stderr," maxVolumes = %d\n", config_data_p->maxVolumes); fprintf(stderr," currentCells = %d\n", config_data_p->currentCells); fprintf(stderr," maxCells = %d\n", config_data_p->maxCells); ! fprintf(stderr," hashTableSize = %d\n", config_data_p->hashTableSize); fprintf(stderr," currentSCaches = %d\n", config_data_p->currentSCaches); fprintf(stderr," maxSCaches = %d\n", config_data_p->maxSCaches); cm_data = *config_data_p; --- 424,436 ---- fprintf(stderr," blockSize = %d\n", config_data_p->blockSize); fprintf(stderr," bufferSize = %d\n", config_data_p->bufferSize); fprintf(stderr," cacheType = %d\n", config_data_p->cacheType); + fprintf(stderr," volumeHashTableSize = %d", config_data_p->volumeHashTableSize); fprintf(stderr," currentVolumes = %d\n", config_data_p->currentVolumes); fprintf(stderr," maxVolumes = %d\n", config_data_p->maxVolumes); + fprintf(stderr," cellHashTableSize = %d", config_data_p->cellHashTableSize); fprintf(stderr," currentCells = %d\n", config_data_p->currentCells); fprintf(stderr," maxCells = %d\n", config_data_p->maxCells); ! fprintf(stderr," scacheHashTableSize = %d\n", config_data_p->scacheHashTableSize); fprintf(stderr," currentSCaches = %d\n", config_data_p->currentSCaches); fprintf(stderr," maxSCaches = %d\n", config_data_p->maxSCaches); cm_data = *config_data_p; *************** *** 802,812 **** afsi_log(" blockSize = %d", config_data_p->blockSize); afsi_log(" bufferSize = %d", config_data_p->bufferSize); afsi_log(" cacheType = %d", config_data_p->cacheType); afsi_log(" currentVolumes = %d", config_data_p->currentVolumes); afsi_log(" maxVolumes = %d", config_data_p->maxVolumes); afsi_log(" currentCells = %d", config_data_p->currentCells); afsi_log(" maxCells = %d", config_data_p->maxCells); ! afsi_log(" hashTableSize = %d", config_data_p->hashTableSize); afsi_log(" currentSCaches = %d", config_data_p->currentSCaches); afsi_log(" maxSCaches = %d", config_data_p->maxSCaches); --- 824,836 ---- afsi_log(" blockSize = %d", config_data_p->blockSize); afsi_log(" bufferSize = %d", config_data_p->bufferSize); afsi_log(" cacheType = %d", config_data_p->cacheType); + afsi_log(" volumeHashTableSize = %d", config_data_p->volumeHashTableSize); afsi_log(" currentVolumes = %d", config_data_p->currentVolumes); afsi_log(" maxVolumes = %d", config_data_p->maxVolumes); + afsi_log(" cellHashTableSize = %d", config_data_p->cellHashTableSize); afsi_log(" currentCells = %d", config_data_p->currentCells); afsi_log(" maxCells = %d", config_data_p->maxCells); ! afsi_log(" scacheHashTableSize = %d", config_data_p->scacheHashTableSize); afsi_log(" currentSCaches = %d", config_data_p->currentSCaches); afsi_log(" maxSCaches = %d", config_data_p->maxSCaches); *************** *** 827,833 **** cm_data.chunkSize = chunkSize; cm_data.blockSize = CM_CONFIGDEFAULT_BLOCKSIZE; cm_data.bufferSize = mappingSize; ! cm_data.hashTableSize = osi_PrimeLessThan(stats / 2 + 1); if (virtualCache) { cm_data.cacheType = CM_BUF_CACHETYPE_VIRTUAL; } else { --- 851,859 ---- cm_data.chunkSize = chunkSize; cm_data.blockSize = CM_CONFIGDEFAULT_BLOCKSIZE; cm_data.bufferSize = mappingSize; ! cm_data.scacheHashTableSize = osi_PrimeLessThan(stats / 2 + 1); ! cm_data.volumeHashTableSize = osi_PrimeLessThan((afs_uint32)(maxVols/7 + 1)); ! cm_data.cellHashTableSize = osi_PrimeLessThan((afs_uint32)(maxCells/7 + 1)); if (virtualCache) { cm_data.cacheType = CM_BUF_CACHETYPE_VIRTUAL; } else { *************** *** 844,860 **** baseAddress += ComputeSizeOfConfigData(); cm_data.volumeBaseAddress = (cm_volume_t *) baseAddress; baseAddress += ComputeSizeOfVolumes(maxVols); cm_data.cellBaseAddress = (cm_cell_t *) baseAddress; baseAddress += ComputeSizeOfCells(maxCells); cm_data.aclBaseAddress = (cm_aclent_t *) baseAddress; baseAddress += ComputeSizeOfACLCache(stats); cm_data.scacheBaseAddress = (cm_scache_t *) baseAddress; baseAddress += ComputeSizeOfSCache(stats); ! cm_data.hashTablep = (cm_scache_t **) baseAddress; baseAddress += ComputeSizeOfSCacheHT(stats); cm_data.dnlcBaseAddress = (cm_nc_t *) baseAddress; baseAddress += ComputeSizeOfDNLCache(); ! cm_data.buf_hashTablepp = (cm_buf_t **) baseAddress; baseAddress += ComputeSizeOfDataHT(cacheBlocks); cm_data.buf_fileHashTablepp = (cm_buf_t **) baseAddress; baseAddress += ComputeSizeOfDataHT(cacheBlocks); --- 870,898 ---- baseAddress += ComputeSizeOfConfigData(); cm_data.volumeBaseAddress = (cm_volume_t *) baseAddress; baseAddress += ComputeSizeOfVolumes(maxVols); + cm_data.volumeNameHashTablep = (cm_volume_t **)baseAddress; + baseAddress += ComputeSizeOfVolumeHT(maxVols); + cm_data.volumeRWIDHashTablep = (cm_volume_t **)baseAddress; + baseAddress += ComputeSizeOfVolumeHT(maxVols); + cm_data.volumeROIDHashTablep = (cm_volume_t **)baseAddress; + baseAddress += ComputeSizeOfVolumeHT(maxVols); + cm_data.volumeBKIDHashTablep = (cm_volume_t **)baseAddress; + baseAddress += ComputeSizeOfVolumeHT(maxVols); + cm_data.cellNameHashTablep = (cm_cell_t **)baseAddress; + baseAddress += ComputeSizeOfCellHT(maxCells); + cm_data.cellIDHashTablep = (cm_cell_t **)baseAddress; + baseAddress += ComputeSizeOfCellHT(maxCells); cm_data.cellBaseAddress = (cm_cell_t *) baseAddress; baseAddress += ComputeSizeOfCells(maxCells); cm_data.aclBaseAddress = (cm_aclent_t *) baseAddress; baseAddress += ComputeSizeOfACLCache(stats); cm_data.scacheBaseAddress = (cm_scache_t *) baseAddress; baseAddress += ComputeSizeOfSCache(stats); ! cm_data.scacheHashTablep = (cm_scache_t **) baseAddress; baseAddress += ComputeSizeOfSCacheHT(stats); cm_data.dnlcBaseAddress = (cm_nc_t *) baseAddress; baseAddress += ComputeSizeOfDNLCache(); ! cm_data.buf_scacheHashTablepp = (cm_buf_t **) baseAddress; baseAddress += ComputeSizeOfDataHT(cacheBlocks); cm_data.buf_fileHashTablepp = (cm_buf_t **) baseAddress; baseAddress += ComputeSizeOfDataHT(cacheBlocks); Index: openafs/src/WINNT/afsd/cm_memmap.h diff -c openafs/src/WINNT/afsd/cm_memmap.h:1.3.4.2 openafs/src/WINNT/afsd/cm_memmap.h:1.3.4.4 *** openafs/src/WINNT/afsd/cm_memmap.h:1.3.4.2 Sun Feb 4 22:41:41 2007 --- openafs/src/WINNT/afsd/cm_memmap.h Fri Jun 22 18:16:39 2007 *************** *** 51,64 **** cm_aclent_t * aclLRUp; cm_aclent_t * aclLRUEndp; ! cm_scache_t ** hashTablep; ! afs_uint32 hashTableSize; afs_uint32 currentSCaches; afs_uint32 maxSCaches; cm_scache_t * scacheLRUFirstp; cm_scache_t * scacheLRULastp; cm_nc_t * ncfreelist; cm_nc_t * nameCache; cm_nc_t ** nameHash; --- 51,77 ---- cm_aclent_t * aclLRUp; cm_aclent_t * aclLRUEndp; ! cm_scache_t ** scacheHashTablep; ! afs_uint32 scacheHashTableSize; + cm_scache_t * allSCachesp; afs_uint32 currentSCaches; afs_uint32 maxSCaches; cm_scache_t * scacheLRUFirstp; cm_scache_t * scacheLRULastp; + cm_cell_t ** cellNameHashTablep; + cm_cell_t ** cellIDHashTablep; + afs_uint32 cellHashTableSize; + + cm_volume_t ** volumeNameHashTablep; + cm_volume_t ** volumeRWIDHashTablep; + cm_volume_t ** volumeROIDHashTablep; + cm_volume_t ** volumeBKIDHashTablep; + afs_uint32 volumeHashTableSize; + cm_volume_t * volumeLRUFirstp; + cm_volume_t * volumeLRULastp; + cm_nc_t * ncfreelist; cm_nc_t * nameCache; cm_nc_t ** nameHash; *************** *** 67,73 **** cm_buf_t * buf_freeListEndp; cm_buf_t * buf_dirtyListp; cm_buf_t * buf_dirtyListEndp; ! cm_buf_t ** buf_hashTablepp; cm_buf_t ** buf_fileHashTablepp; cm_buf_t * buf_allp; afs_uint64 buf_nbuffers; --- 80,86 ---- cm_buf_t * buf_freeListEndp; cm_buf_t * buf_dirtyListp; cm_buf_t * buf_dirtyListEndp; ! cm_buf_t ** buf_scacheHashTablepp; cm_buf_t ** buf_fileHashTablepp; cm_buf_t * buf_allp; afs_uint64 buf_nbuffers; Index: openafs/src/WINNT/afsd/cm_scache.c diff -c openafs/src/WINNT/afsd/cm_scache.c:1.35.2.34 openafs/src/WINNT/afsd/cm_scache.c:1.35.2.39 *** openafs/src/WINNT/afsd/cm_scache.c:1.35.2.34 Wed May 16 11:51:05 2007 --- openafs/src/WINNT/afsd/cm_scache.c Fri Jul 6 19:22:03 2007 *************** *** 42,48 **** #endif /* must be called with cm_scacheLock write-locked! */ ! void cm_AdjustLRU(cm_scache_t *scp) { if (scp == cm_data.scacheLRULastp) cm_data.scacheLRULastp = (cm_scache_t *) osi_QPrev(&scp->q); --- 42,48 ---- #endif /* must be called with cm_scacheLock write-locked! */ ! void cm_AdjustScacheLRU(cm_scache_t *scp) { if (scp == cm_data.scacheLRULastp) cm_data.scacheLRULastp = (cm_scache_t *) osi_QPrev(&scp->q); *************** *** 62,68 **** if (scp->flags & CM_SCACHEFLAG_INHASH) { /* hash it out first */ i = CM_SCACHE_HASH(&scp->fid); ! for (lscpp = &cm_data.hashTablep[i], tscp = cm_data.hashTablep[i]; tscp; lscpp = &tscp->nextp, tscp = tscp->nextp) { if (tscp == scp) { --- 62,68 ---- if (scp->flags & CM_SCACHEFLAG_INHASH) { /* hash it out first */ i = CM_SCACHE_HASH(&scp->fid); ! for (lscpp = &cm_data.scacheHashTablep[i], tscp = cm_data.scacheHashTablep[i]; tscp; lscpp = &tscp->nextp, tscp = tscp->nextp) { if (tscp == scp) { *************** *** 162,179 **** scp->bulkStatProgress = hzero; scp->waitCount = 0; scp->fid.vnode = 0; scp->fid.volume = 0; scp->fid.unique = 0; scp->fid.cell = 0; - /* discard callback */ - if (scp->cbServerp) { - cm_PutServer(scp->cbServerp); - scp->cbServerp = NULL; - } - scp->cbExpires = 0; - /* remove from dnlc */ cm_dnlcPurgedp(scp); cm_dnlcPurgevp(scp); --- 162,178 ---- scp->bulkStatProgress = hzero; scp->waitCount = 0; + if (scp->cbServerp) { + cm_PutServer(scp->cbServerp); + scp->cbServerp = NULL; + } + scp->cbExpires = 0; + scp->fid.vnode = 0; scp->fid.volume = 0; scp->fid.unique = 0; scp->fid.cell = 0; /* remove from dnlc */ cm_dnlcPurgedp(scp); cm_dnlcPurgevp(scp); *************** *** 222,228 **** scp; scp = (cm_scache_t *) osi_QPrev(&scp->q)) { ! osi_assert(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.hashTablep); if (scp->refCount == 0) { if (scp->flags & CM_SCACHEFLAG_DELETED) { --- 221,227 ---- scp; scp = (cm_scache_t *) osi_QPrev(&scp->q)) { ! osi_assert(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.scacheHashTablep); if (scp->refCount == 0) { if (scp->flags & CM_SCACHEFLAG_DELETED) { *************** *** 233,239 **** /* now remove from the LRU queue and put it back at the * head of the LRU queue. */ ! cm_AdjustLRU(scp); /* and we're done */ return scp; --- 232,238 ---- /* now remove from the LRU queue and put it back at the * head of the LRU queue. */ ! cm_AdjustScacheLRU(scp); /* and we're done */ return scp; *************** *** 244,250 **** /* now remove from the LRU queue and put it back at the * head of the LRU queue. */ ! cm_AdjustLRU(scp); /* and we're done */ return scp; --- 243,249 ---- /* now remove from the LRU queue and put it back at the * head of the LRU queue. */ ! cm_AdjustScacheLRU(scp); /* and we're done */ return scp; *************** *** 258,297 **** /* There were no deleted scache objects that we could use. Try to find * one that simply hasn't been used in a while. */ ! for ( scp = cm_data.scacheLRULastp; ! scp; ! scp = (cm_scache_t *) osi_QPrev(&scp->q)) ! { ! /* It is possible for the refCount to be zero and for there still ! * to be outstanding dirty buffers. If there are dirty buffers, ! * we must not recycle the scp. */ ! if (scp->refCount == 0 && scp->bufReadsp == NULL && scp->bufWritesp == NULL) { ! if (!buf_DirtyBuffersExist(&scp->fid)) { ! if (!cm_RecycleSCache(scp, 0)) { ! /* we found an entry, so return it */ ! /* now remove from the LRU queue and put it back at the ! * head of the LRU queue. ! */ ! cm_AdjustLRU(scp); ! ! /* and we're done */ ! return scp; ! } ! } else { ! osi_Log1(afsd_logp,"GetNewSCache dirty buffers exist scp 0x%x", scp); ! } ! } ! } ! osi_Log1(afsd_logp, "GetNewSCache all scache entries in use (retry = %d)", retry); ! ! return NULL; } /* if we get here, we should allocate a new scache entry. We either are below * quota or we have a leak and need to allocate a new one to avoid panicing. */ scp = cm_data.scacheBaseAddress + cm_data.currentSCaches; ! osi_assert(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.hashTablep); memset(scp, 0, sizeof(cm_scache_t)); scp->magic = CM_SCACHE_MAGIC; lock_InitializeMutex(&scp->mx, "cm_scache_t mutex"); --- 257,296 ---- /* There were no deleted scache objects that we could use. Try to find * one that simply hasn't been used in a while. */ ! for ( scp = cm_data.scacheLRULastp; ! scp; ! scp = (cm_scache_t *) osi_QPrev(&scp->q)) ! { ! /* It is possible for the refCount to be zero and for there still ! * to be outstanding dirty buffers. If there are dirty buffers, ! * we must not recycle the scp. */ ! if (scp->refCount == 0 && scp->bufReadsp == NULL && scp->bufWritesp == NULL) { ! if (!buf_DirtyBuffersExist(&scp->fid)) { ! if (!cm_RecycleSCache(scp, 0)) { ! /* we found an entry, so return it */ ! /* now remove from the LRU queue and put it back at the ! * head of the LRU queue. ! */ ! cm_AdjustScacheLRU(scp); ! ! /* and we're done */ ! return scp; ! } ! } else { ! osi_Log1(afsd_logp,"GetNewSCache dirty buffers exist scp 0x%x", scp); ! } ! } ! } ! osi_Log1(afsd_logp, "GetNewSCache all scache entries in use (retry = %d)", retry); ! ! return NULL; } /* if we get here, we should allocate a new scache entry. We either are below * quota or we have a leak and need to allocate a new one to avoid panicing. */ scp = cm_data.scacheBaseAddress + cm_data.currentSCaches; ! osi_assert(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.scacheHashTablep); memset(scp, 0, sizeof(cm_scache_t)); scp->magic = CM_SCACHE_MAGIC; lock_InitializeMutex(&scp->mx, "cm_scache_t mutex"); *************** *** 305,310 **** --- 304,311 ---- cm_data.currentSCaches++; cm_dnlcPurgedp(scp); /* make doubly sure that this is not in dnlc */ cm_dnlcPurgevp(scp); + scp->allNextp = cm_data.allSCachesp; + cm_data.allSCachesp = scp; return scp; } *************** *** 419,426 **** } } ! for ( i=0; i < cm_data.hashTableSize; i++ ) { ! for ( scp = cm_data.hashTablep[i]; scp; scp = scp->nextp ) { if (scp->magic != CM_SCACHE_MAGIC) { afsi_log("cm_ValidateSCache failure: scp->magic != CM_SCACHE_MAGIC"); fprintf(stderr, "cm_ValidateSCache failure: scp->magic != CM_SCACHE_MAGIC\n"); --- 420,427 ---- } } ! for ( i=0; i < cm_data.scacheHashTableSize; i++ ) { ! for ( scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp ) { if (scp->magic != CM_SCACHE_MAGIC) { afsi_log("cm_ValidateSCache failure: scp->magic != CM_SCACHE_MAGIC"); fprintf(stderr, "cm_ValidateSCache failure: scp->magic != CM_SCACHE_MAGIC\n"); *************** *** 447,467 **** return cm_dnlcValidate(); } long cm_ShutdownSCache(void) { cm_scache_t * scp; ! for ( scp = cm_data.scacheLRULastp; scp; ! scp = (cm_scache_t *) osi_QPrev(&scp->q) ) { if (scp->randomACLp) { lock_ObtainMutex(&scp->mx); cm_FreeAllACLEnts(scp); lock_ReleaseMutex(&scp->mx); } lock_FinalizeMutex(&scp->mx); lock_FinalizeRWLock(&scp->bufCreateLock); } return cm_dnlcShutdown(); } --- 448,501 ---- return cm_dnlcValidate(); } + void + cm_SuspendSCache(void) + { + cm_scache_t * scp; + + cm_GiveUpAllCallbacksAllServers(); + + lock_ObtainWrite(&cm_scacheLock); + for ( scp = cm_data.allSCachesp; scp; + scp = scp->allNextp ) { + if (scp->cbServerp) { + cm_PutServer(scp->cbServerp); + scp->cbServerp = NULL; + } + scp->cbExpires = 0; + scp->flags &= ~CM_SCACHEFLAG_CALLBACK; + } + lock_ReleaseWrite(&cm_scacheLock); + } + long cm_ShutdownSCache(void) { cm_scache_t * scp; ! lock_ObtainWrite(&cm_scacheLock); ! ! for ( scp = cm_data.allSCachesp; scp; ! scp = scp->allNextp ) { if (scp->randomACLp) { lock_ObtainMutex(&scp->mx); cm_FreeAllACLEnts(scp); lock_ReleaseMutex(&scp->mx); } + + if (scp->cbServerp) { + cm_PutServer(scp->cbServerp); + scp->cbServerp = NULL; + } + scp->cbExpires = 0; + scp->flags &= ~CM_SCACHEFLAG_CALLBACK; + lock_FinalizeMutex(&scp->mx); lock_FinalizeRWLock(&scp->bufCreateLock); } + lock_ReleaseWrite(&cm_scacheLock); + + cm_GiveUpAllCallbacksAllServers(); return cm_dnlcShutdown(); } *************** *** 473,487 **** if (osi_Once(&once)) { lock_InitializeRWLock(&cm_scacheLock, "cm_scacheLock"); if ( newFile ) { ! memset(cm_data.hashTablep, 0, sizeof(cm_scache_t *) * cm_data.hashTableSize); cm_data.currentSCaches = 0; cm_data.maxSCaches = maxSCaches; cm_data.scacheLRUFirstp = cm_data.scacheLRULastp = NULL; } else { cm_scache_t * scp; ! for ( scp = cm_data.scacheLRULastp; scp; ! scp = (cm_scache_t *) osi_QPrev(&scp->q) ) { lock_InitializeMutex(&scp->mx, "cm_scache_t mutex"); lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock"); --- 507,522 ---- if (osi_Once(&once)) { lock_InitializeRWLock(&cm_scacheLock, "cm_scacheLock"); if ( newFile ) { ! memset(cm_data.scacheHashTablep, 0, sizeof(cm_scache_t *) * cm_data.scacheHashTableSize); ! cm_data.allSCachesp = NULL; cm_data.currentSCaches = 0; cm_data.maxSCaches = maxSCaches; cm_data.scacheLRUFirstp = cm_data.scacheLRULastp = NULL; } else { cm_scache_t * scp; ! for ( scp = cm_data.allSCachesp; scp; ! scp = scp->allNextp ) { lock_InitializeMutex(&scp->mx, "cm_scache_t mutex"); lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock"); *************** *** 523,532 **** } lock_ObtainWrite(&cm_scacheLock); ! for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { cm_HoldSCacheNoLock(scp); ! cm_AdjustLRU(scp); lock_ReleaseWrite(&cm_scacheLock); return scp; } --- 558,567 ---- } lock_ObtainWrite(&cm_scacheLock); ! for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { cm_HoldSCacheNoLock(scp); ! cm_AdjustScacheLRU(scp); lock_ReleaseWrite(&cm_scacheLock); return scp; } *************** *** 567,573 **** // yj: check if we have the scp, if so, we don't need // to do anything else lock_ObtainWrite(&cm_scacheLock); ! for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { #ifdef DEBUG_REFCOUNT afsi_log("%s:%d cm_GetSCache (1) outScpp 0x%p ref %d", file, line, scp, scp->refCount); --- 602,608 ---- // yj: check if we have the scp, if so, we don't need // to do anything else lock_ObtainWrite(&cm_scacheLock); ! for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { #ifdef DEBUG_REFCOUNT afsi_log("%s:%d cm_GetSCache (1) outScpp 0x%p ref %d", file, line, scp, scp->refCount); *************** *** 575,581 **** #endif cm_HoldSCacheNoLock(scp); *outScpp = scp; ! cm_AdjustLRU(scp); lock_ReleaseWrite(&cm_scacheLock); return 0; } --- 610,616 ---- #endif cm_HoldSCacheNoLock(scp); *outScpp = scp; ! cm_AdjustScacheLRU(scp); lock_ReleaseWrite(&cm_scacheLock); return 0; } *************** *** 638,645 **** scp->dotdotFid.unique=1; scp->dotdotFid.vnode=1; scp->flags |= (CM_SCACHEFLAG_PURERO | CM_SCACHEFLAG_RO); ! scp->nextp=cm_data.hashTablep[hash]; ! cm_data.hashTablep[hash]=scp; scp->flags |= CM_SCACHEFLAG_INHASH; scp->refCount = 1; osi_Log1(afsd_logp,"cm_GetSCache (freelance) sets refCount to 1 scp 0x%x", scp); --- 673,680 ---- scp->dotdotFid.unique=1; scp->dotdotFid.vnode=1; scp->flags |= (CM_SCACHEFLAG_PURERO | CM_SCACHEFLAG_RO); ! scp->nextp=cm_data.scacheHashTablep[hash]; ! cm_data.scacheHashTablep[hash]=scp; scp->flags |= CM_SCACHEFLAG_INHASH; scp->refCount = 1; osi_Log1(afsd_logp,"cm_GetSCache (freelance) sets refCount to 1 scp 0x%x", scp); *************** *** 685,691 **** if (!cellp) return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, &volp); if (code) return code; lock_ObtainWrite(&cm_scacheLock); --- 720,726 ---- if (!cellp) return CM_ERROR_NOSUCHCELL; ! code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, CM_GETVOL_FLAG_CREATE, &volp); if (code) return code; lock_ObtainWrite(&cm_scacheLock); *************** *** 694,700 **** /* otherwise, we have the volume, now reverify that the scp doesn't * exist, and proceed. */ ! for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { #ifdef DEBUG_REFCOUNT afsi_log("%s:%d cm_GetSCache (3) outScpp 0x%p ref %d", file, line, scp, scp->refCount); --- 729,735 ---- /* otherwise, we have the volume, now reverify that the scp doesn't * exist, and proceed. */ ! for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { #ifdef DEBUG_REFCOUNT afsi_log("%s:%d cm_GetSCache (3) outScpp 0x%p ref %d", file, line, scp, scp->refCount); *************** *** 702,708 **** #endif cm_HoldSCacheNoLock(scp); osi_assert(scp->volp == volp); ! cm_AdjustLRU(scp); lock_ReleaseWrite(&cm_scacheLock); if (volp) cm_PutVolume(volp); --- 737,743 ---- #endif cm_HoldSCacheNoLock(scp); osi_assert(scp->volp == volp); ! cm_AdjustScacheLRU(scp); lock_ReleaseWrite(&cm_scacheLock); if (volp) cm_PutVolume(volp); *************** *** 746,758 **** scp->dotdotFid = volp->dotdotFid; } ! if (volp->roID == fidp->volume) scp->flags |= (CM_SCACHEFLAG_PURERO | CM_SCACHEFLAG_RO); ! else if (volp->bkID == fidp->volume) scp->flags |= CM_SCACHEFLAG_RO; } ! scp->nextp = cm_data.hashTablep[hash]; ! cm_data.hashTablep[hash] = scp; scp->flags |= CM_SCACHEFLAG_INHASH; scp->refCount = 1; osi_Log1(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%x", scp); --- 781,793 ---- scp->dotdotFid = volp->dotdotFid; } ! if (volp->ro.ID == fidp->volume) scp->flags |= (CM_SCACHEFLAG_PURERO | CM_SCACHEFLAG_RO); ! else if (volp->bk.ID == fidp->volume) scp->flags |= CM_SCACHEFLAG_RO; } ! scp->nextp = cm_data.scacheHashTablep[hash]; ! cm_data.scacheHashTablep[hash] = scp; scp->flags |= CM_SCACHEFLAG_INHASH; scp->refCount = 1; osi_Log1(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%x", scp); *************** *** 793,799 **** if (cm_FidCmp(&scp->fid, &parent_fid)) { i = CM_SCACHE_HASH(&parent_fid); ! for (pscp = cm_data.hashTablep[i]; pscp; pscp = pscp->nextp) { if (!cm_FidCmp(&pscp->fid, &parent_fid)) { cm_HoldSCacheNoLock(pscp); break; --- 828,834 ---- if (cm_FidCmp(&scp->fid, &parent_fid)) { i = CM_SCACHE_HASH(&parent_fid); ! for (pscp = cm_data.scacheHashTablep[i]; pscp; pscp = pscp->nextp) { if (!cm_FidCmp(&pscp->fid, &parent_fid)) { cm_HoldSCacheNoLock(pscp); break; *************** *** 1355,1361 **** struct cm_volume *volp = NULL; cm_GetVolumeByID(cellp, scp->fid.volume, userp, ! (cm_req_t *) NULL, &volp); osi_Log2(afsd_logp, "old data from server %x volume %s", scp->cbServerp->addr.sin_addr.s_addr, volp ? volp->namep : "(unknown)"); --- 1390,1396 ---- struct cm_volume *volp = NULL; cm_GetVolumeByID(cellp, scp->fid.volume, userp, ! (cm_req_t *) NULL, CM_GETVOL_FLAG_CREATE, &volp); osi_Log2(afsd_logp, "old data from server %x volume %s", scp->cbServerp->addr.sin_addr.s_addr, volp ? volp->namep : "(unknown)"); *************** *** 1564,1570 **** osi_assert(fidp->cell != 0); lock_ObtainWrite(&cm_scacheLock); ! for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { lock_ReleaseWrite(&cm_scacheLock); return scp->fileType; --- 1599,1605 ---- osi_assert(fidp->cell != 0); lock_ObtainWrite(&cm_scacheLock); ! for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { if (cm_FidCmp(fidp, &scp->fid) == 0) { lock_ReleaseWrite(&cm_scacheLock); return scp->fileType; *************** *** 1582,1625 **** { int zilch; cm_scache_t *scp; ! char output[1024]; int i; if (lock) lock_ObtainRead(&cm_scacheLock); ! sprintf(output, "%s - dumping scache - cm_data.currentSCaches=%d, cm_data.maxSCaches=%d\r\n", cookie, cm_data.currentSCaches, cm_data.maxSCaches); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! for (scp = cm_data.scacheLRULastp; scp; scp = (cm_scache_t *) osi_QPrev(&scp->q)) { ! if (scp->refCount != 0) ! { ! sprintf(output, "%s scp=0x%p, fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\r\n", ! cookie, scp, scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique, ! scp->refCount); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! } } ! sprintf(output, "%s - dumping cm_data.hashTable - cm_data.hashTableSize=%d\r\n", cookie, cm_data.hashTableSize); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! for (i = 0; i < cm_data.hashTableSize; i++) { ! for(scp = cm_data.hashTablep[i]; scp; scp=scp->nextp) { ! if (scp->refCount != 0) ! { ! sprintf(output, "%s scp=0x%p, hash=%d, fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\r\n", ! cookie, scp, i, scp->fid.cell, scp->fid.volume, scp->fid.vnode, ! scp->fid.unique, scp->refCount); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! } } } ! sprintf(output, "%s - Done dumping scache.\r\n", cookie); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); if (lock) --- 1617,1656 ---- { int zilch; cm_scache_t *scp; ! char output[2048]; int i; if (lock) lock_ObtainRead(&cm_scacheLock); ! sprintf(output, "%s - dumping all scache - cm_data.currentSCaches=%d, cm_data.maxSCaches=%d\r\n", cookie, cm_data.currentSCaches, cm_data.maxSCaches); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! for (scp = cm_data.allSCachesp; scp; scp = scp->allNextp) { ! sprintf(output, "%s scp=0x%p, fid (cell=%d, volume=%d, vnode=%d, unique=%d) volp=0x%p type=%d dv=%d len=0x%I64x mp='%s' flags=0x%x cb=0x%x refCount=%u\r\n", ! cookie, scp, scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique, ! scp->volp, scp->fileType, scp->dataVersion, scp->length.QuadPart, scp->mountPointStringp, scp->flags, ! (unsigned long)scp->cbExpires, scp->refCount); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } ! sprintf(output, "%s - Done dumping all scache.\r\n", cookie); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! sprintf(output, "%s - dumping cm_data.scacheHashTable - cm_data.scacheHashTableSize=%d\r\n", cookie, cm_data.scacheHashTableSize); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! for (i = 0; i < cm_data.scacheHashTableSize; i++) { ! for(scp = cm_data.scacheHashTablep[i]; scp; scp=scp->nextp) { ! sprintf(output, "%s scp=0x%p, hash=%d, fid (cell=%d, volume=%d, vnode=%d, unique=%d)\r\n", ! cookie, scp, i, scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } } ! sprintf(output, "%s - Done dumping cm_data.scacheHashTable\r\n", cookie); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); if (lock) Index: openafs/src/WINNT/afsd/cm_scache.h diff -c openafs/src/WINNT/afsd/cm_scache.h:1.21.2.11 openafs/src/WINNT/afsd/cm_scache.h:1.21.2.13 *** openafs/src/WINNT/afsd/cm_scache.h:1.21.2.11 Wed Feb 7 12:35:16 2007 --- openafs/src/WINNT/afsd/cm_scache.h Thu Jun 28 00:05:20 2007 *************** *** 89,94 **** --- 89,95 ---- osi_queue_t q; /* lru queue; cm_scacheLock */ afs_uint32 magic; struct cm_scache *nextp; /* next in hash; cm_scacheLock */ + struct cm_scache *allNextp; /* next in all scache list; cm_scacheLock */ cm_fid_t fid; afs_uint32 flags; /* flags; locked by mx */ *************** *** 302,308 **** ((fidp)->volume + \ (fidp)->vnode + \ (fidp)->unique)) \ ! % cm_data.hashTableSize) #include "cm_conn.h" #include "cm_buf.h" --- 303,309 ---- ((fidp)->volume + \ (fidp)->vnode + \ (fidp)->unique)) \ ! % cm_data.scacheHashTableSize) #include "cm_conn.h" #include "cm_buf.h" *************** *** 378,383 **** --- 379,386 ---- extern long cm_ShutdownSCache(void); + extern void cm_SuspendSCache(void); + extern long cm_RecycleSCache(cm_scache_t *scp, afs_int32 flags); extern void cm_RemoveSCacheFromHashTable(cm_scache_t *scp); Index: openafs/src/WINNT/afsd/cm_server.c diff -c openafs/src/WINNT/afsd/cm_server.c:1.25.2.4 openafs/src/WINNT/afsd/cm_server.c:1.25.2.11 *** openafs/src/WINNT/afsd/cm_server.c:1.25.2.4 Mon Mar 19 09:46:15 2007 --- openafs/src/WINNT/afsd/cm_server.c Sat Jul 7 09:38:33 2007 *************** *** 22,27 **** --- 22,28 ---- #include #include "afsd.h" + #include #include #include *************** *** 54,59 **** --- 55,61 ---- long usecs; Capabilities caps = {0, 0}; char hoststr[16]; + cm_req_t req; lock_ObtainMutex(&tsp->mx); if (tsp->flags & CM_SERVERFLAG_PINGING) { *************** *** 86,106 **** wasDown ? "down" : "up", tsp->capabilities); if (wasDown) ! rx_SetConnDeadTime(connp->callp, 10); if (tsp->type == CM_SERVER_VLDB) { ! code = VL_ProbeServer(connp->callp); } else { /* file server */ - rxconnp = cm_GetRxConn(connp); code = RXAFS_GetCapabilities(rxconnp, &caps); if (code == RXGEN_OPCODE) code = RXAFS_GetTime(rxconnp, &secs, &usecs); - rx_PutConnection(rxconnp); } if (wasDown) ! rx_SetConnDeadTime(connp->callp, ConnDeadtimeout); cm_PutConn(connp); } /* got an unauthenticated connection to this server */ --- 88,108 ---- wasDown ? "down" : "up", tsp->capabilities); + rxconnp = cm_GetRxConn(connp); if (wasDown) ! rx_SetConnDeadTime(rxconnp, 10); if (tsp->type == CM_SERVER_VLDB) { ! code = VL_ProbeServer(rxconnp); } else { /* file server */ code = RXAFS_GetCapabilities(rxconnp, &caps); if (code == RXGEN_OPCODE) code = RXAFS_GetTime(rxconnp, &secs, &usecs); } if (wasDown) ! rx_SetConnDeadTime(rxconnp, ConnDeadtimeout); ! rx_PutConnection(rxconnp); cm_PutConn(connp); } /* got an unauthenticated connection to this server */ *************** *** 123,128 **** --- 125,154 ---- osi_LogSaveString(afsd_logp, hoststr), tsp->type == CM_SERVER_VLDB ? "vldb" : "file", tsp->capabilities); + + /* Now update the volume status if necessary */ + if (wasDown) { + cm_server_vols_t * tsrvp; + cm_volume_t * volp; + int i; + + lock_ReleaseMutex(&tsp->mx); + for (tsrvp = tsp->vols; tsrvp; tsrvp = tsrvp->nextp) { + for (i=0; iids[i] != 0) { + cm_InitReq(&req); + + code = cm_GetVolumeByID(tsp->cellp, tsrvp->ids[i], cm_rootUserp, + &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp); + if (code == 0) { + cm_UpdateVolumeStatus(volp, tsrvp->ids[i]); + cm_PutVolume(volp); + } + } + } + } + lock_ObtainMutex(&tsp->mx); + } } else { /* mark server as down */ tsp->flags |= CM_SERVERFLAG_DOWN; *************** *** 133,138 **** --- 159,188 ---- osi_LogSaveString(afsd_logp, hoststr), tsp->type == CM_SERVER_VLDB ? "vldb" : "file", tsp->capabilities); + + /* Now update the volume status if necessary */ + if (!wasDown) { + cm_server_vols_t * tsrvp; + cm_volume_t * volp; + int i; + + lock_ReleaseMutex(&tsp->mx); + for (tsrvp = tsp->vols; tsrvp; tsrvp = tsrvp->nextp) { + for (i=0; iids[i] != 0) { + cm_InitReq(&req); + + code = cm_GetVolumeByID(tsp->cellp, tsrvp->ids[i], cm_rootUserp, + &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp); + if (code == 0) { + cm_UpdateVolumeStatus(volp, tsrvp->ids[i]); + cm_PutVolume(volp); + } + } + } + } + lock_ObtainMutex(&tsp->mx); + } } if (tsp->waitCount == 0) *************** *** 152,157 **** --- 202,208 ---- cm_server_t *tsp; int doPing; int isDown; + int isFS; lock_ObtainWrite(&cm_serverLock); for (tsp = cm_allServersp; tsp; tsp = tsp->allNextp) { *************** *** 163,168 **** --- 214,220 ---- doPing = 0; isDown = tsp->flags & CM_SERVERFLAG_DOWN; + isFS = tsp->type == CM_SERVER_FILE; /* only do the ping if the cell matches the requested cell, or we're * matching all cells (cellp == NULL), and if we've requested to ping *************** *** 170,176 **** */ if ((cellp == NULL || cellp == tsp->cellp) && ((isDown && (flags & CM_FLAG_CHECKDOWNSERVERS)) || ! (!isDown && (flags & CM_FLAG_CHECKUPSERVERS)))) { doPing = 1; } /* we're supposed to check this up/down server */ lock_ReleaseMutex(&tsp->mx); --- 222,232 ---- */ if ((cellp == NULL || cellp == tsp->cellp) && ((isDown && (flags & CM_FLAG_CHECKDOWNSERVERS)) || ! (!isDown && (flags & CM_FLAG_CHECKUPSERVERS))) && ! ((!(flags & CM_FLAG_CHECKVLDBSERVERS) || ! !isFS && (flags & CM_FLAG_CHECKVLDBSERVERS)) && ! (!(flags & CM_FLAG_CHECKFILESERVERS) || ! isFS && (flags & CM_FLAG_CHECKFILESERVERS)))) { doPing = 1; } /* we're supposed to check this up/down server */ lock_ReleaseMutex(&tsp->mx); *************** *** 311,332 **** osi_assert(socketp->sin_family == AF_INET); tsp = malloc(sizeof(*tsp)); ! memset(tsp, 0, sizeof(*tsp)); ! tsp->type = type; ! tsp->cellp = cellp; ! tsp->refCount = 1; ! lock_InitializeMutex(&tsp->mx, "cm_server_t mutex"); ! tsp->addr = *socketp; ! tsp->flags = CM_SERVERFLAG_DOWN; /* assume down; ping will mark up if available */ ! ! cm_SetServerPrefs(tsp); ! ! lock_ObtainWrite(&cm_serverLock); /* get server lock */ ! tsp->allNextp = cm_allServersp; ! cm_allServersp = tsp; ! lock_ReleaseWrite(&cm_serverLock); /* release server lock */ - cm_PingServer(tsp); /* Obtain Capabilities and check up/down state */ return tsp; } --- 367,406 ---- osi_assert(socketp->sin_family == AF_INET); tsp = malloc(sizeof(*tsp)); ! if (tsp) { ! memset(tsp, 0, sizeof(*tsp)); ! tsp->type = type; ! tsp->cellp = cellp; ! tsp->refCount = 1; ! lock_InitializeMutex(&tsp->mx, "cm_server_t mutex"); ! tsp->addr = *socketp; ! tsp->flags = CM_SERVERFLAG_DOWN; /* assume down; ping will mark up if available */ ! ! cm_SetServerPrefs(tsp); ! ! lock_ObtainWrite(&cm_serverLock); /* get server lock */ ! tsp->allNextp = cm_allServersp; ! cm_allServersp = tsp; ! lock_ReleaseWrite(&cm_serverLock); /* release server lock */ ! ! cm_PingServer(tsp); /* Obtain Capabilities and check up/down state */ ! } ! return tsp; ! } ! ! cm_server_t * ! cm_FindServerByIP(afs_uint32 ipaddr, int type) ! { ! cm_server_t *tsp; ! ! lock_ObtainRead(&cm_serverLock); ! for (tsp = cm_allServersp; tsp; tsp = tsp->allNextp) { ! if (tsp->type == type && ! tsp->addr.sin_addr.S_un.S_addr == ipaddr) ! break; ! } ! lock_ReleaseRead(&cm_serverLock); return tsp; } *************** *** 355,371 **** return tsp; } ! cm_serverRef_t *cm_NewServerRef(cm_server_t *serverp) { cm_serverRef_t *tsrp; cm_GetServer(serverp); tsrp = malloc(sizeof(*tsrp)); tsrp->server = serverp; ! tsrp->status = not_busy; tsrp->next = NULL; tsrp->refCount = 1; return tsrp; } --- 429,501 ---- return tsp; } ! cm_server_vols_t *cm_NewServerVols(void) { ! cm_server_vols_t *tsvp; ! ! tsvp = malloc(sizeof(*tsvp)); ! if (tsvp) ! memset(tsvp, 0, sizeof(*tsvp)); ! ! return tsvp; ! } ! ! cm_serverRef_t *cm_NewServerRef(cm_server_t *serverp, afs_uint32 volID) { cm_serverRef_t *tsrp; + cm_server_vols_t **tsrvpp = NULL; + afs_uint32 *slotp = NULL; + int found = 0; cm_GetServer(serverp); tsrp = malloc(sizeof(*tsrp)); tsrp->server = serverp; ! tsrp->status = srv_not_busy; tsrp->next = NULL; + tsrp->volID = volID; tsrp->refCount = 1; + /* if we have a non-zero volID, we need to add it to the list + * of volumes maintained by the server. There are two phases: + * (1) see if the volID is already in the list and (2) insert + * it into the first empty slot if it is not. + */ + if (volID) { + lock_ObtainMutex(&serverp->mx); + + tsrvpp = &serverp->vols; + while (*tsrvpp) { + int i; + + for (i=0; iids[i] == volID) { + found = 1; + break; + } else if (!slotp && (*tsrvpp)->ids[i] == 0) { + slotp = &(*tsrvpp)->ids[i]; + } + } + + if (found) + break; + + tsrvpp = &(*tsrvpp)->nextp; + } + + if (!found) { + if (slotp) { + *slotp = volID; + } else { + /* if we didn't find an empty slot in a current + * page we must need a new page */ + *tsrvpp = cm_NewServerVols(); + if (*tsrvpp) + (*tsrvpp)->ids[0] = volID; + } + } + + lock_ReleaseMutex(&serverp->mx); + } + return tsrp; } *************** *** 515,520 **** --- 645,652 ---- /* call cm_FreeServer while holding a write lock on cm_serverLock */ void cm_FreeServer(cm_server_t* serverp) { + cm_server_vols_t * tsrvp, *nextp; + cm_PutServerNoLock(serverp); if (serverp->refCount == 0) { *************** *** 538,549 **** } } } free(serverp); } } } ! void cm_FreeServerList(cm_serverRef_t** list) { cm_serverRef_t **current = list; cm_serverRef_t **nextp = 0; --- 670,706 ---- } } } + + /* free the volid list */ + for ( tsrvp = serverp->vols; tsrvp; tsrvp = nextp) { + nextp = tsrvp->nextp; + free(tsrvp); + } + free(serverp); } } } ! void cm_RemoveVolumeFromServer(cm_server_t * serverp, afs_uint32 volID) ! { ! cm_server_vols_t * tsrvp; ! int i; ! ! if (volID == 0) ! return; ! ! for (tsrvp = serverp->vols; tsrvp; tsrvp = tsrvp->nextp) { ! for (i=0; iids[i] == volID) { ! tsrvp->ids[i] = 0;; ! break; ! } ! } ! } ! } ! ! void cm_FreeServerList(cm_serverRef_t** list, afs_uint32 flags) { cm_serverRef_t **current = list; cm_serverRef_t **nextp = 0; *************** *** 556,569 **** nextp = &(*current)->next; if (--((*current)->refCount) == 0) { next = *nextp; cm_FreeServer((*current)->server); free(*current); *current = next; } else { ! current = nextp; } } lock_ReleaseWrite(&cm_serverLock); } - --- 713,733 ---- nextp = &(*current)->next; if (--((*current)->refCount) == 0) { next = *nextp; + + if ((*current)->volID) + cm_RemoveVolumeFromServer((*current)->server, (*current)->volID); cm_FreeServer((*current)->server); free(*current); *current = next; } else { ! if (flags & CM_FREESERVERLIST_DELETE) { ! (*current)->status = srv_deleted; ! if ((*current)->volID) ! cm_RemoveVolumeFromServer((*current)->server, (*current)->volID); ! } ! current = nextp; } } lock_ReleaseWrite(&cm_serverLock); } Index: openafs/src/WINNT/afsd/cm_server.h diff -c openafs/src/WINNT/afsd/cm_server.h:1.13.2.3 openafs/src/WINNT/afsd/cm_server.h:1.13.2.8 *** openafs/src/WINNT/afsd/cm_server.h:1.13.2.3 Tue Jun 27 23:24:05 2006 --- openafs/src/WINNT/afsd/cm_server.h Thu Jun 28 00:50:15 2007 *************** *** 17,22 **** --- 17,29 ---- #endif /* !DJGPP */ #include + /* this value is set to 1022 in order to */ + #define NUM_SERVER_VOLS (32 - sizeof(void *) / 4) + typedef struct cm_server_vols { + afs_uint32 ids[NUM_SERVER_VOLS]; + struct cm_server_vols *nextp; + } cm_server_vols_t; + /* pointed to by volumes and cells without holds; cm_serverLock is obtained * at the appropriate times to change the pointers to these servers. */ *************** *** 32,46 **** unsigned long refCount; /* locked by cm_serverLock */ osi_mutex_t mx; unsigned short ipRank; /* server priority */ } cm_server_t; ! enum repstate {not_busy, busy, offline}; typedef struct cm_serverRef { struct cm_serverRef *next; /* locked by cm_serverLock */ struct cm_server *server; /* locked by cm_serverLock */ enum repstate status; /* locked by cm_serverLock */ unsigned long refCount; /* locked by cm_serverLock */ } cm_serverRef_t; /* types */ --- 39,55 ---- unsigned long refCount; /* locked by cm_serverLock */ osi_mutex_t mx; unsigned short ipRank; /* server priority */ + cm_server_vols_t * vols; /* by mx */ } cm_server_t; ! enum repstate {srv_not_busy, srv_busy, srv_offline, srv_deleted}; typedef struct cm_serverRef { struct cm_serverRef *next; /* locked by cm_serverLock */ struct cm_server *server; /* locked by cm_serverLock */ enum repstate status; /* locked by cm_serverLock */ unsigned long refCount; /* locked by cm_serverLock */ + afs_uint32 volID; /* locked by cm_serverLock */ } cm_serverRef_t; /* types */ *************** *** 58,63 **** --- 67,74 ---- /* flags for procedures */ #define CM_FLAG_CHECKUPSERVERS 1 /* check working servers */ #define CM_FLAG_CHECKDOWNSERVERS 2 /* check down servers */ + #define CM_FLAG_CHECKVLDBSERVERS 4 /* check only vldb servers */ + #define CM_FLAG_CHECKFILESERVERS 8 /* check only file servers */ /* values for ipRank */ #define CM_IPRANK_TOP 5000 /* on same machine */ *************** *** 72,78 **** extern cm_server_t *cm_NewServer(struct sockaddr_in *addrp, int type, struct cm_cell *cellp); ! extern cm_serverRef_t *cm_NewServerRef(struct cm_server *serverp); extern LONG_PTR cm_ChecksumServerList(cm_serverRef_t *serversp); --- 83,89 ---- extern cm_server_t *cm_NewServer(struct sockaddr_in *addrp, int type, struct cm_cell *cellp); ! extern cm_serverRef_t *cm_NewServerRef(struct cm_server *serverp, afs_uint32 volID); extern LONG_PTR cm_ChecksumServerList(cm_serverRef_t *serversp); *************** *** 104,110 **** extern void cm_FreeServer(cm_server_t* server); ! extern void cm_FreeServerList(cm_serverRef_t** list); extern void cm_ForceNewConnectionsAllServers(void); --- 115,123 ---- extern void cm_FreeServer(cm_server_t* server); ! #define CM_FREESERVERLIST_DELETE 1 ! ! extern void cm_FreeServerList(cm_serverRef_t** list, afs_uint32 flags); extern void cm_ForceNewConnectionsAllServers(void); *************** *** 112,115 **** --- 125,130 ---- extern void cm_SetServerNoInlineBulk(cm_server_t * serverp, int no); + extern cm_server_t * cm_FindServerByIP(afs_uint32 addr, int type); + #endif /* __CM_SERVER_H_ENV__ */ Index: openafs/src/WINNT/afsd/cm_vnodeops.c diff -c openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.30 openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.32 *** openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.30 Wed May 2 20:45:58 2007 --- openafs/src/WINNT/afsd/cm_vnodeops.c Wed Jun 13 18:28:25 2007 *************** *** 24,34 **** #include "afsd.h" - /* Used by cm_FollowMountPoint */ - #define RWVOL 0 - #define ROVOL 1 - #define BACKVOL 2 - #ifdef DEBUG extern void afsi_log(char *pattern, ...); #endif --- 24,29 ---- *************** *** 991,996 **** --- 986,992 ---- return code; } + /* called with a locked scp and chases the mount point, yielding outScpp. * scp remains locked, just for simplicity of describing the interface. */ *************** *** 1067,1073 **** /* now we need to get the volume */ lock_ReleaseMutex(&scp->mx); ! code = cm_GetVolumeByName(cellp, volNamep, userp, reqp, 0, &volp); lock_ObtainMutex(&scp->mx); if (code == 0) { --- 1063,1075 ---- /* now we need to get the volume */ lock_ReleaseMutex(&scp->mx); ! if (cm_VolNameIsID(volNamep)) { ! code = cm_GetVolumeByID(cellp, atoi(volNamep), userp, reqp, ! CM_GETVOL_FLAG_CREATE, &volp); ! } else { ! code = cm_GetVolumeByName(cellp, volNamep, userp, reqp, ! CM_GETVOL_FLAG_CREATE, &volp); ! } lock_ObtainMutex(&scp->mx); if (code == 0) { *************** *** 1088,1101 **** * the read-only, otherwise use the one specified. */ if (mtType == '#' && (scp->flags & CM_SCACHEFLAG_PURERO) ! && volp->roID != 0 && type == RWVOL) type = ROVOL; if (type == ROVOL) ! scp->mountRootFid.volume = volp->roID; else if (type == BACKVOL) ! scp->mountRootFid.volume = volp->bkID; else ! scp->mountRootFid.volume = volp->rwID; /* the rest of the fid is a magic number */ scp->mountRootFid.vnode = 1; --- 1090,1103 ---- * the read-only, otherwise use the one specified. */ if (mtType == '#' && (scp->flags & CM_SCACHEFLAG_PURERO) ! && volp->ro.ID != 0 && type == RWVOL) type = ROVOL; if (type == ROVOL) ! scp->mountRootFid.volume = volp->ro.ID; else if (type == BACKVOL) ! scp->mountRootFid.volume = volp->bk.ID; else ! scp->mountRootFid.volume = volp->rw.ID; /* the rest of the fid is a magic number */ scp->mountRootFid.vnode = 1; *************** *** 1292,1297 **** --- 1294,1407 ---- return 1; } + long cm_EvaluateVolumeReference(char * namep, long flags, cm_user_t * userp, + cm_req_t *reqp, cm_scache_t ** outpScpp) + { + long code = 0; + char cellName[CELL_MAXNAMELEN]; + char volumeName[VL_MAXNAMELEN]; + size_t len; + char * cp; + char * tp; + + cm_cell_t * cellp = NULL; + cm_volume_t * volp = NULL; + cm_fid_t fid; + int volType; + int mountType = RWVOL; + + osi_Log1(afsd_logp, "cm_EvaluateVolumeReference for string [%s]", + osi_LogSaveString(afsd_logp, namep)); + + if (strnicmp(namep, CM_PREFIX_VOL, CM_PREFIX_VOL_CCH) != 0) { + goto _exit_invalid_path; + } + + /* namep is assumed to look like the following: + + @vol:%\0 + or + @vol:#\0 + + */ + + cp = namep + CM_PREFIX_VOL_CCH; /* cp points to cell name, hopefully */ + tp = strchr(cp, '%'); + if (tp == NULL) + tp = strchr(cp, '#'); + if (tp == NULL || + (len = tp - cp) == 0 || + len > CELL_MAXNAMELEN) + goto _exit_invalid_path; + strncpy(cellName, cp, len); + cellName[len] = '\0'; + + if (*tp == '#') + mountType = ROVOL; + + cp = tp+1; /* cp now points to volume, supposedly */ + strncpy(volumeName, cp, VL_MAXNAMELEN-1); + volumeName[VL_MAXNAMELEN - 1] = 0; + + /* OK, now we have the cell and the volume */ + osi_Log2(afsd_logp, " Found cell [%s] and volume [%s]", + osi_LogSaveString(afsd_logp, cellName), + osi_LogSaveString(afsd_logp, volumeName)); + + cellp = cm_GetCell(cellName, CM_FLAG_CREATE); + if (cellp == NULL) { + goto _exit_invalid_path; + } + + len = strlen(volumeName); + if (len >= 8 && strcmp(volumeName + len - 7, ".backup") == 0) + volType = BACKVOL; + else if (len >= 10 && + strcmp(volumeName + len - 9, ".readonly") == 0) + volType = ROVOL; + else + volType = RWVOL; + + if (cm_VolNameIsID(volumeName)) { + code = cm_GetVolumeByID(cellp, atoi(volumeName), userp, reqp, + CM_GETVOL_FLAG_CREATE, &volp); + } else { + code = cm_GetVolumeByName(cellp, volumeName, userp, reqp, + CM_GETVOL_FLAG_CREATE, &volp); + } + + if (code != 0) + goto _exit_cleanup; + + fid.cell = cellp->cellID; + + if (volType == BACKVOL) + fid.volume = volp->bk.ID; + else if (volType == ROVOL || + (volType == RWVOL && mountType == ROVOL && volp->ro.ID != 0)) + fid.volume = volp->ro.ID; + else + fid.volume = volp->rw.ID; + + fid.vnode = 1; + fid.unique = 1; + + code = cm_GetSCache(&fid, outpScpp, userp, reqp); + + _exit_cleanup: + if (volp) + cm_PutVolume(volp); + + if (code == 0) + return code; + + _exit_invalid_path: + if (flags & CM_FLAG_CHECKPATH) + return CM_ERROR_NOSUCHPATH; + else + return CM_ERROR_NOSUCHFILE; + } + #ifdef DEBUG_REFCOUNT long cm_LookupDbg(cm_scache_t *dscp, char *namep, long flags, cm_user_t *userp, cm_req_t *reqp, cm_scache_t **outpScpp, char * file, long line) *************** *** 1317,1348 **** return CM_ERROR_NOSUCHFILE; } ! for ( sysNameIndex = 0; sysNameIndex < MAXNUMSYSNAMES; sysNameIndex++) { ! code = cm_ExpandSysName(namep, tname, sizeof(tname), sysNameIndex); ! if (code > 0) { ! code = cm_LookupInternal(dscp, tname, flags, userp, reqp, &scp); #ifdef DEBUG_REFCOUNT ! afsi_log("%s:%d cm_LookupInternal (1) code 0x%x dscp 0x%p ref %d scp 0x%p ref %d", file, line, code, dscp, dscp->refCount, scp, scp ? scp->refCount : 0); ! osi_Log3(afsd_logp, "cm_LookupInternal (1) code 0x%x dscp 0x%p scp 0x%p", code, dscp, scp); #endif ! if (code == 0) { *outpScpp = scp; ! return 0; ! } ! if (scp) { ! cm_ReleaseSCache(scp); ! scp = NULL; } ! } else { ! code = cm_LookupInternal(dscp, namep, flags, userp, reqp, &scp); #ifdef DEBUG_REFCOUNT ! afsi_log("%s:%d cm_LookupInternal (2) code 0x%x dscp 0x%p ref %d scp 0x%p ref %d", file, line, code, dscp, dscp->refCount, scp, scp ? scp->refCount : 0); ! osi_Log3(afsd_logp, "cm_LookupInternal (2) code 0x%x dscp 0x%p scp 0x%p", code, dscp, scp); #endif ! *outpScpp = scp; ! return code; ! } } /* None of the possible sysName expansions could be found */ --- 1427,1473 ---- return CM_ERROR_NOSUCHFILE; } ! if (dscp == cm_data.rootSCachep && ! strnicmp(namep, CM_PREFIX_VOL, CM_PREFIX_VOL_CCH) == 0) { ! return cm_EvaluateVolumeReference(namep, flags, userp, reqp, outpScpp); ! } ! ! if (cm_ExpandSysName(namep, NULL, 0, 0) > 0) { ! for ( sysNameIndex = 0; sysNameIndex < MAXNUMSYSNAMES; sysNameIndex++) { ! code = cm_ExpandSysName(namep, tname, sizeof(tname), sysNameIndex); ! if (code > 0) { ! code = cm_LookupInternal(dscp, tname, flags, userp, reqp, &scp); #ifdef DEBUG_REFCOUNT ! afsi_log("%s:%d cm_LookupInternal (1) code 0x%x dscp 0x%p ref %d scp 0x%p ref %d", file, line, code, dscp, dscp->refCount, scp, scp ? scp->refCount : 0); ! osi_Log3(afsd_logp, "cm_LookupInternal (1) code 0x%x dscp 0x%p scp 0x%p", code, dscp, scp); #endif ! if (code == 0) { ! *outpScpp = scp; ! return 0; ! } ! if (scp) { ! cm_ReleaseSCache(scp); ! scp = NULL; ! } ! } else { ! code = cm_LookupInternal(dscp, namep, flags, userp, reqp, &scp); ! #ifdef DEBUG_REFCOUNT ! afsi_log("%s:%d cm_LookupInternal (2) code 0x%x dscp 0x%p ref %d scp 0x%p ref %d", file, line, code, dscp, dscp->refCount, scp, scp ? scp->refCount : 0); ! osi_Log3(afsd_logp, "cm_LookupInternal (2) code 0x%x dscp 0x%p scp 0x%p", code, dscp, scp); ! #endif *outpScpp = scp; ! return code; } ! } ! } else { ! code = cm_LookupInternal(dscp, namep, flags, userp, reqp, &scp); #ifdef DEBUG_REFCOUNT ! afsi_log("%s:%d cm_LookupInternal (2) code 0x%x dscp 0x%p ref %d scp 0x%p ref %d", file, line, code, dscp, dscp->refCount, scp, scp ? scp->refCount : 0); ! osi_Log3(afsd_logp, "cm_LookupInternal (2) code 0x%x dscp 0x%p scp 0x%p", code, dscp, scp); #endif ! *outpScpp = scp; ! return code; } /* None of the possible sysName expansions could be found */ *************** *** 1385,1391 **** osi_Log1(afsd_logp, "CALL RemoveFile scp 0x%p", dscp); do { ! code = cm_Conn(&dscp->fid, userp, reqp, &connp); if (code) continue; --- 1510,1516 ---- osi_Log1(afsd_logp, "CALL RemoveFile scp 0x%p", dscp); do { ! code = cm_ConnFromFID(&dscp->fid, userp, reqp, &connp); if (code) continue; *************** *** 2026,2032 **** cm_StartCallbackGrantingCall(NULL, &cbReq); osi_Log1(afsd_logp, "CALL BulkStatus, %d entries", filesThisCall); do { ! code = cm_Conn(&dscp->fid, userp, reqp, &connp); if (code) continue; --- 2151,2157 ---- cm_StartCallbackGrantingCall(NULL, &cbReq); osi_Log1(afsd_logp, "CALL BulkStatus, %d entries", filesThisCall); do { ! code = cm_ConnFromFID(&dscp->fid, userp, reqp, &connp); if (code) continue; *************** *** 2294,2300 **** /* now make the RPC */ osi_Log1(afsd_logp, "CALL StoreStatus scp 0x%p", scp); do { ! code = cm_Conn(&scp->fid, userp, reqp, &connp); if (code) continue; --- 2419,2425 ---- /* now make the RPC */ osi_Log1(afsd_logp, "CALL StoreStatus scp 0x%p", scp); do { ! code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp); if (code) continue; *************** *** 2372,2378 **** /* try the RPC now */ osi_Log1(afsd_logp, "CALL CreateFile scp 0x%p", dscp); do { ! code = cm_Conn(&dscp->fid, userp, reqp, &connp); if (code) continue; --- 2497,2503 ---- /* try the RPC now */ osi_Log1(afsd_logp, "CALL CreateFile scp 0x%p", dscp); do { ! code = cm_ConnFromFID(&dscp->fid, userp, reqp, &connp); if (code) continue; *************** *** 2506,2512 **** /* try the RPC now */ osi_Log1(afsd_logp, "CALL MakeDir scp 0x%p", dscp); do { ! code = cm_Conn(&dscp->fid, userp, reqp, &connp); if (code) continue; --- 2631,2637 ---- /* try the RPC now */ osi_Log1(afsd_logp, "CALL MakeDir scp 0x%p", dscp); do { ! code = cm_ConnFromFID(&dscp->fid, userp, reqp, &connp); if (code) continue; *************** *** 2597,2603 **** /* try the RPC now */ osi_Log1(afsd_logp, "CALL Link scp 0x%p", dscp); do { ! code = cm_Conn(&dscp->fid, userp, reqp, &connp); if (code) continue; dirAFSFid.Volume = dscp->fid.volume; --- 2722,2728 ---- /* try the RPC now */ osi_Log1(afsd_logp, "CALL Link scp 0x%p", dscp); do { ! code = cm_ConnFromFID(&dscp->fid, userp, reqp, &connp); if (code) continue; dirAFSFid.Volume = dscp->fid.volume; *************** *** 2665,2671 **** /* try the RPC now */ osi_Log1(afsd_logp, "CALL Symlink scp 0x%p", dscp); do { ! code = cm_Conn(&dscp->fid, userp, reqp, &connp); if (code) continue; --- 2790,2796 ---- /* try the RPC now */ osi_Log1(afsd_logp, "CALL Symlink scp 0x%p", dscp); do { ! code = cm_ConnFromFID(&dscp->fid, userp, reqp, &connp); if (code) continue; *************** *** 2747,2753 **** /* try the RPC now */ osi_Log1(afsd_logp, "CALL RemoveDir scp 0x%p", dscp); do { ! code = cm_Conn(&dscp->fid, userp, reqp, &connp); if (code) continue; --- 2872,2878 ---- /* try the RPC now */ osi_Log1(afsd_logp, "CALL RemoveDir scp 0x%p", dscp); do { ! code = cm_ConnFromFID(&dscp->fid, userp, reqp, &connp); if (code) continue; *************** *** 2899,2905 **** osi_Log2(afsd_logp, "CALL Rename old scp 0x%p new scp 0x%p", oldDscp, newDscp); do { ! code = cm_Conn(&oldDscp->fid, userp, reqp, &connp); if (code) continue; --- 3024,3030 ---- osi_Log2(afsd_logp, "CALL Rename old scp 0x%p new scp 0x%p", oldDscp, newDscp); do { ! code = cm_ConnFromFID(&oldDscp->fid, userp, reqp, &connp); if (code) continue; *************** *** 3483,3489 **** lock_ReleaseMutex(&scp->mx); do { ! code = cm_Conn(&cfid, userp, reqp, &connp); if (code) break; --- 3608,3614 ---- lock_ReleaseMutex(&scp->mx); do { ! code = cm_ConnFromFID(&cfid, userp, reqp, &connp); if (code) break; *************** *** 3527,3533 **** osi_Log1(afsd_logp, "CALL ReleaseLock scp 0x%p", scp); do { ! code = cm_Conn(&cfid, userp, reqp, &connp); if (code) break; --- 3652,3658 ---- osi_Log1(afsd_logp, "CALL ReleaseLock scp 0x%p", scp); do { ! code = cm_ConnFromFID(&cfid, userp, reqp, &connp); if (code) break; *************** *** 3910,3920 **** if (code != 0 && (scp->sharedLocks > 0 || scp->exclusiveLocks > 0) && ! scp->serverLock == -1) { ! /* Oops. We lost the lock. */ ! cm_LockMarkSCacheLost(scp); ! } } } else if (code == 0) { /* server locks not enabled */ osi_Log0(afsd_logp, " Skipping server lock for scp"); --- 4035,4045 ---- if (code != 0 && (scp->sharedLocks > 0 || scp->exclusiveLocks > 0) && ! scp->serverLock == -1) { ! /* Oops. We lost the lock. */ ! cm_LockMarkSCacheLost(scp); } + } } else if (code == 0) { /* server locks not enabled */ osi_Log0(afsd_logp, " Skipping server lock for scp"); *************** *** 4527,4533 **** lock_ReleaseMutex(&scp->mx); do { ! code = cm_Conn(&cfid, userp, &req, &connp); if (code) break; --- 4652,4658 ---- lock_ReleaseMutex(&scp->mx); do { ! code = cm_ConnFromFID(&cfid, userp, &req, &connp); if (code) break; *************** *** 4967,4975 **** cm_file_lock_t *fileLock; unsigned int i; ! for (i = 0; i < cm_data.hashTableSize; i++) { ! for ( scp = cm_data.hashTablep[i]; scp; scp = scp->nextp ) { while (scp->fileLocksH != NULL) { lock_ObtainMutex(&scp->mx); lock_ObtainWrite(&cm_scacheLock); --- 5092,5100 ---- cm_file_lock_t *fileLock; unsigned int i; ! for (i = 0; i < cm_data.scacheHashTableSize; i++) { ! for ( scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp ) { while (scp->fileLocksH != NULL) { lock_ObtainMutex(&scp->mx); lock_ObtainWrite(&cm_scacheLock); Index: openafs/src/WINNT/afsd/cm_vnodeops.h diff -c openafs/src/WINNT/afsd/cm_vnodeops.h:1.14.4.4 openafs/src/WINNT/afsd/cm_vnodeops.h:1.14.4.5 *** openafs/src/WINNT/afsd/cm_vnodeops.h:1.14.4.4 Sun Dec 17 16:07:23 2006 --- openafs/src/WINNT/afsd/cm_vnodeops.h Wed Jun 13 18:28:25 2007 *************** *** 45,50 **** --- 45,61 ---- typedef int (*cm_DirFuncp_t)(struct cm_scache *, struct cm_dirEntry *, void *, osi_hyper_t *entryOffsetp); + /* Special path syntax for direct references to volumes + + The syntax: @vol:{%,#} can be used to refer to a + specific volume in a specific cell, where: + + : name of the cell + : volume name or ID + */ + #define CM_PREFIX_VOL "@vol:" + #define CM_PREFIX_VOL_CCH 5 + /* arrays */ extern unsigned char cm_foldUpper[]; *************** *** 69,75 **** char *shortName, char **shortNameEndp); extern long cm_ReadMountPoint(cm_scache_t *scp, cm_user_t *userp, ! cm_req_t *reqp); #ifdef DEBUG_REFCOUNT extern long cm_NameIDbg(cm_scache_t *rootSCachep, char *pathp, long flags, --- 80,89 ---- char *shortName, char **shortNameEndp); extern long cm_ReadMountPoint(cm_scache_t *scp, cm_user_t *userp, ! cm_req_t *reqp); ! ! extern long cm_EvaluateVolumeReference(char * namep, long flags, cm_user_t * userp, ! cm_req_t *reqp, cm_scache_t ** outpScpp); #ifdef DEBUG_REFCOUNT extern long cm_NameIDbg(cm_scache_t *rootSCachep, char *pathp, long flags, Index: openafs/src/WINNT/afsd/cm_volstat.c diff -c /dev/null openafs/src/WINNT/afsd/cm_volstat.c:1.1.2.2 *** /dev/null Wed Jul 11 00:47:27 2007 --- openafs/src/WINNT/afsd/cm_volstat.c Thu Jul 5 15:22:16 2007 *************** *** 0 **** --- 1,286 ---- + /* Copyright 2007 Secure Endpoints Inc. + * + * BSD 2-part License + */ + + /* This source file provides the declarations + * which specify the AFS Cache Manager Volume Status Event + * Notification API + */ + + #include + #include + + #include + #include + #include + #include + #include + #include "afsd.h" + #include + + HMODULE hVolStatus = NULL; + dll_VolStatus_Funcs_t dll_funcs; + cm_VolStatus_Funcs_t cm_funcs; + + /* This function is used to load any Volume Status Handlers + * and their associated function pointers. + */ + long + cm_VolStatus_Initialization(void) + { + long (__fastcall * dll_VolStatus_Initialization)(dll_VolStatus_Funcs_t * dll_funcs, cm_VolStatus_Funcs_t *cm_funcs) = NULL; + long code = 0; + HKEY parmKey; + DWORD dummyLen; + char wd[MAX_PATH+1] = ""; + + code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY, + 0, KEY_QUERY_VALUE, &parmKey); + if (code == ERROR_SUCCESS) { + dummyLen = sizeof(wd); + code = RegQueryValueEx(parmKey, "VolStatusHandler", NULL, NULL, + (BYTE *) &wd, &dummyLen); + RegCloseKey (parmKey); + } + + if (code == ERROR_SUCCESS && wd[0]) + hVolStatus = LoadLibrary(wd); + if (hVolStatus) { + (FARPROC) dll_VolStatus_Initialization = GetProcAddress(hVolStatus, "@VolStatus_Initialization@8"); + if (dll_VolStatus_Initialization) { + cm_funcs.version = CM_VOLSTATUS_FUNCS_VERSION; + cm_funcs.cm_VolStatus_Path_To_ID = cm_VolStatus_Path_To_ID; + cm_funcs.cm_VolStatus_Path_To_DFSlink = cm_VolStatus_Path_To_DFSlink; + + code = dll_VolStatus_Initialization(&dll_funcs, &cm_funcs); + } + + if (dll_VolStatus_Initialization == NULL || code != 0 || + dll_funcs.version != DLL_VOLSTATUS_FUNCS_VERSION) { + FreeLibrary(hVolStatus); + hVolStatus = NULL; + code = -1; + } + } + + return code; + } + + /* This function is used to unload any Volume Status Handlers + * that were loaded during initialization. + */ + long + cm_VolStatus_Finalize(void) + { + if (hVolStatus == NULL) + return 0; + + FreeLibrary(hVolStatus); + hVolStatus = NULL; + return 0; + } + + /* This function notifies the Volume Status Handlers that the + * AFS client service has started. If the network is started + * at this point we call cm_VolStatus_Network_Started(). + */ + long + cm_VolStatus_Service_Started(void) + { + long code = 0; + + if (hVolStatus == NULL) + return 0; + + code = dll_funcs.dll_VolStatus_Service_Started(); + if (code == 0 && smb_IsNetworkStarted()) + code = dll_funcs.dll_VolStatus_Network_Started(cm_NetbiosName, cm_NetbiosName); + + return code; + } + + /* This function notifies the Volume Status Handlers that the + * AFS client service is stopping. + */ + long + cm_VolStatus_Service_Stopped(void) + { + long code = 0; + + if (hVolStatus == NULL) + return 0; + + code = dll_funcs.dll_VolStatus_Service_Stopped(); + + return code; + } + + + /* This function notifies the Volume Status Handlers that the + * AFS client service is accepting network requests using the + * specified netbios names. + */ + long + #ifdef _WIN64 + cm_VolStatus_Network_Started(const char * netbios32, const char * netbios64) + #else /* _WIN64 */ + cm_VolStatus_Network_Started(const char * netbios) + #endif /* _WIN64 */ + { + long code = 0; + + if (hVolStatus == NULL) + return 0; + + #ifdef _WIN64 + code = dll_funcs.dll_VolStatus_Network_Started(netbios32, netbios64); + #else + code = dll_funcs.dll_VolStatus_Network_Started(netbios, netbios); + #endif + + return code; + } + + /* This function notifies the Volume Status Handlers that the + * AFS client service is no longer accepting network requests + * using the specified netbios names + */ + long + #ifdef _WIN64 + cm_VolStatus_Network_Stopped(const char * netbios32, const char * netbios64) + #else /* _WIN64 */ + cm_VolStatus_Network_Stopped(const char * netbios) + #endif /* _WIN64 */ + { + long code = 0; + + if (hVolStatus == NULL) + return 0; + + #ifdef _WIN64 + code = dll_funcs.dll_VolStatus_Network_Stopped(netbios32, netbios64); + #else + code = dll_funcs.dll_VolStatus_Network_Stopped(netbios, netbios); + #endif + + return code; + } + + /* This function is called when the IP address list changes. + * Volume Status Handlers can use this notification as a hint + * that it might be possible to determine volume IDs for paths + * that previously were not accessible. + */ + long + cm_VolStatus_Network_Addr_Change(void) + { + long code = 0; + + if (hVolStatus == NULL) + return 0; + + code = dll_funcs.dll_VolStatus_Network_Addr_Change(); + + return code; + } + + /* This function notifies the Volume Status Handlers that the + * state of the specified cell.volume has changed. + */ + long + cm_VolStatus_Change_Notification(afs_uint32 cellID, afs_uint32 volID, enum volstatus status) + { + long code = 0; + + if (hVolStatus == NULL) + return 0; + + code = dll_funcs.dll_VolStatus_Change_Notification(cellID, volID, status); + + return code; + } + + + long __fastcall + cm_VolStatus_Path_To_ID(const char * share, const char * path, afs_uint32 * cellID, afs_uint32 * volID) + { + afs_uint32 code; + cm_req_t req; + cm_scache_t *scp; + + if (cellID == NULL || volID == NULL) + return CM_ERROR_INVAL; + + cm_InitReq(&req); + + + code = cm_NameI(cm_data.rootSCachep, (char *)path, CM_FLAG_FOLLOW, cm_rootUserp, (char *)share, &req, &scp); + if (code) + return code; + + lock_ObtainMutex(&scp->mx); + code = cm_SyncOp(scp, NULL,cm_rootUserp, &req, 0, + CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); + if (code) { + lock_ReleaseMutex(&scp->mx); + cm_ReleaseSCache(scp); + return code; + } + + cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); + + *cellID = scp->fid.cell; + *volID = scp->fid.volume; + + lock_ReleaseMutex(&scp->mx); + cm_ReleaseSCache(scp); + + return 0; + } + + long __fastcall + cm_VolStatus_Path_To_DFSlink(const char * share, const char * path, afs_uint32 *pBufSize, char *pBuffer) + { + afs_uint32 code; + cm_req_t req; + cm_scache_t *scp; + size_t len; + + if (pBufSize == NULL || (pBuffer == NULL && *pBufSize != 0)) + return CM_ERROR_INVAL; + + cm_InitReq(&req); + + code = cm_NameI(cm_data.rootSCachep, (char *)path, CM_FLAG_FOLLOW, cm_rootUserp, (char *)share, &req, &scp); + if (code) + return code; + + lock_ObtainMutex(&scp->mx); + code = cm_SyncOp(scp, NULL, cm_rootUserp, &req, 0, + CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); + if (code) { + lock_ReleaseMutex(&scp->mx); + cm_ReleaseSCache(scp); + return code; + } + + cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); + + if (scp->fileType != CM_SCACHETYPE_DFSLINK) + return CM_ERROR_NOT_A_DFSLINK; + + len = strlen(scp->mountPointStringp) + 1; + if (pBuffer == NULL) + *pBufSize = len; + else if (*pBufSize >= len) { + strcpy(pBuffer, scp->mountPointStringp); + *pBufSize = len; + } else + code = CM_ERROR_TOOBIG; + + lock_ReleaseMutex(&scp->mx); + cm_ReleaseSCache(scp); + + return 0; + } Index: openafs/src/WINNT/afsd/cm_volstat.h diff -c /dev/null openafs/src/WINNT/afsd/cm_volstat.h:1.1.2.3 *** /dev/null Wed Jul 11 00:47:27 2007 --- openafs/src/WINNT/afsd/cm_volstat.h Fri Jul 6 19:22:04 2007 *************** *** 0 **** --- 1,55 ---- + /* Copyright 2007 Secure Endpoints Inc. + * + * BSD 2-part License + */ + + /* This header file provides the definitions and prototypes + * which specify the AFS Cache Manager Volume Status Event + * Notification API + */ + + + extern long cm_VolStatus_Initialization(void); + + extern long cm_VolStatus_Finalize(void); + + extern long cm_VolStatus_Service_Started(void); + + extern long cm_VolStatus_Service_Stopped(void); + + #ifdef _WIN64 + extern long cm_VolStatus_Network_Started(const char * netbios32, const char * netbios64); + + extern long cm_VolStatus_Network_Stopped(const char * netbios32, const char * netbios64); + #else /* _WIN64 */ + extern long cm_VolStatus_Network_Started(const char * netbios); + + extern long cm_VolStatus_Network_Stopped(const char * netbios); + #endif /* _WIN64 */ + + extern long cm_VolStatus_Network_Addr_Change(void); + + extern long cm_VolStatus_Change_Notification(afs_uint32 cellID, afs_uint32 volID, enum volstatus status); + + extern long __fastcall cm_VolStatus_Path_To_ID(const char * share, const char * path, afs_uint32 * cellID, afs_uint32 * volID); + + extern long __fastcall cm_VolStatus_Path_To_DFSlink(const char * share, const char * path, afs_uint32 *pBufSize, char *pBuffer); + + #define DLL_VOLSTATUS_FUNCS_VERSION 1 + typedef struct dll_VolStatus_Funcs { + afs_uint32 version; + long (__fastcall * dll_VolStatus_Service_Started)(void); + long (__fastcall * dll_VolStatus_Service_Stopped)(void); + long (__fastcall * dll_VolStatus_Network_Started)(const char *netbios32, const char *netbios64); + long (__fastcall * dll_VolStatus_Network_Stopped)(const char *netbios32, const char *netbios64); + long (__fastcall * dll_VolStatus_Network_Addr_Change)(void); + long (__fastcall * dll_VolStatus_Change_Notification)(afs_uint32 cellID, afs_uint32 volID, enum volstatus status); + } dll_VolStatus_Funcs_t; + + #define CM_VOLSTATUS_FUNCS_VERSION 1 + typedef struct cm_VolStatus_Funcs { + afs_uint32 version; + long (__fastcall * cm_VolStatus_Path_To_ID)(const char * share, const char * path, afs_uint32 * cellID, afs_uint32 * volID); + long (__fastcall * cm_VolStatus_Path_To_DFSlink)(const char * share, const char * path, afs_uint32 *pBufSize, char *pBuffer); + } cm_VolStatus_Funcs_t; + Index: openafs/src/WINNT/afsd/cm_volume.c diff -c openafs/src/WINNT/afsd/cm_volume.c:1.14.4.8 openafs/src/WINNT/afsd/cm_volume.c:1.14.4.13 *** openafs/src/WINNT/afsd/cm_volume.c:1.14.4.8 Fri May 4 02:06:13 2007 --- openafs/src/WINNT/afsd/cm_volume.c Thu Jul 5 15:22:16 2007 *************** *** 31,37 **** cm_volume_t * volp; afs_uint32 count; ! for (volp = cm_data.allVolumesp, count = 0; volp; volp=volp->nextp, count++) { if ( volp->magic != CM_VOLUME_MAGIC ) { afsi_log("cm_ValidateVolume failure: volp->magic != CM_VOLUME_MAGIC"); fprintf(stderr, "cm_ValidateVolume failure: volp->magic != CM_VOLUME_MAGIC\n"); --- 31,37 ---- cm_volume_t * volp; afs_uint32 count; ! for (volp = cm_data.allVolumesp, count = 0; volp; volp=volp->allNextp, count++) { if ( volp->magic != CM_VOLUME_MAGIC ) { afsi_log("cm_ValidateVolume failure: volp->magic != CM_VOLUME_MAGIC"); fprintf(stderr, "cm_ValidateVolume failure: volp->magic != CM_VOLUME_MAGIC\n"); *************** *** 42,50 **** fprintf(stderr, "cm_ValidateVolume failure: volp->cellp->magic != CM_CELL_MAGIC\n"); return -2; } ! if ( volp->nextp && volp->nextp->magic != CM_VOLUME_MAGIC ) { ! afsi_log("cm_ValidateVolume failure: volp->nextp->magic != CM_VOLUME_MAGIC"); ! fprintf(stderr, "cm_ValidateVolume failure: volp->nextp->magic != CM_VOLUME_MAGIC\n"); return -3; } if ( count != 0 && volp == cm_data.allVolumesp || --- 42,50 ---- fprintf(stderr, "cm_ValidateVolume failure: volp->cellp->magic != CM_CELL_MAGIC\n"); return -2; } ! if ( volp->allNextp && volp->allNextp->magic != CM_VOLUME_MAGIC ) { ! afsi_log("cm_ValidateVolume failure: volp->allNextp->magic != CM_VOLUME_MAGIC"); ! fprintf(stderr, "cm_ValidateVolume failure: volp->allNextp->magic != CM_VOLUME_MAGIC\n"); return -3; } if ( count != 0 && volp == cm_data.allVolumesp || *************** *** 69,76 **** { cm_volume_t * volp; ! for (volp = cm_data.allVolumesp; volp; volp=volp->nextp) lock_FinalizeMutex(&volp->mx); return 0; } --- 69,85 ---- { cm_volume_t * volp; ! for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { ! ! if (volp->rw.ID) ! cm_VolumeStatusNotification(volp, volp->rw.ID, volp->rw.state, vl_alldown); ! if (volp->ro.ID) ! cm_VolumeStatusNotification(volp, volp->ro.ID, volp->ro.state, vl_alldown); ! if (volp->bk.ID) ! cm_VolumeStatusNotification(volp, volp->bk.ID, volp->bk.state, vl_alldown); ! lock_FinalizeMutex(&volp->mx); + } return 0; } *************** *** 86,106 **** cm_data.allVolumesp = NULL; cm_data.currentVolumes = 0; cm_data.maxVolumes = maxVols; } else { cm_volume_t * volp; ! for (volp = cm_data.allVolumesp; volp; volp=volp->nextp) { lock_InitializeMutex(&volp->mx, "cm_volume_t mutex"); volp->flags |= CM_VOLUMEFLAG_RESET; ! volp->rwServersp = NULL; ! volp->roServersp = NULL; ! volp->bkServersp = NULL; } } osi_EndOnce(&once); } } /* * Update a volume. Caller holds volume's lock (volp->mx). * --- 95,145 ---- cm_data.allVolumesp = NULL; cm_data.currentVolumes = 0; cm_data.maxVolumes = maxVols; + memset(cm_data.volumeNameHashTablep, 0, sizeof(cm_volume_t *) * cm_data.volumeHashTableSize); + memset(cm_data.volumeRWIDHashTablep, 0, sizeof(cm_volume_t *) * cm_data.volumeHashTableSize); + memset(cm_data.volumeROIDHashTablep, 0, sizeof(cm_volume_t *) * cm_data.volumeHashTableSize); + memset(cm_data.volumeBKIDHashTablep, 0, sizeof(cm_volume_t *) * cm_data.volumeHashTableSize); + cm_data.volumeLRUFirstp = cm_data.volumeLRULastp = NULL; } else { cm_volume_t * volp; ! for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { lock_InitializeMutex(&volp->mx, "cm_volume_t mutex"); volp->flags |= CM_VOLUMEFLAG_RESET; ! volp->rw.state = vl_unknown; ! volp->rw.serversp = NULL; ! volp->ro.state = vl_unknown; ! volp->ro.serversp = NULL; ! volp->bk.state = vl_unknown; ! volp->bk.serversp = NULL; ! if (volp->rw.ID) ! cm_VolumeStatusNotification(volp, volp->rw.ID, vl_alldown, volp->rw.state); ! if (volp->ro.ID) ! cm_VolumeStatusNotification(volp, volp->ro.ID, vl_alldown, volp->ro.state); ! if (volp->bk.ID) ! cm_VolumeStatusNotification(volp, volp->bk.ID, vl_alldown, volp->bk.state); } } osi_EndOnce(&once); } } + + /* returns true if the id is a decimal integer, in which case we interpret it + * as an id. make the cache manager much simpler. + * Stolen from src/volser/vlprocs.c */ + int + cm_VolNameIsID(char *aname) + { + int tc; + while (tc = *aname++) { + if (tc > '9' || tc < '0') + return 0; + } + return 1; + } + + /* * Update a volume. Caller holds volume's lock (volp->mx). * *************** *** 143,159 **** #ifdef MULTIHOMED struct uvldbentry uvldbEntry; #endif ! int type = -1; int ROcount = 0; long code; /* clear out old bindings */ ! if (volp->rwServersp) ! cm_FreeServerList(&volp->rwServersp); ! if (volp->roServersp) ! cm_FreeServerList(&volp->roServersp); ! if (volp->bkServersp) ! cm_FreeServerList(&volp->bkServersp); #ifdef AFS_FREELANCE_CLIENT if ( cellp->cellID == AFS_FAKE_ROOT_CELL_ID && atoi(volp->namep)==AFS_FAKE_ROOT_VOL_ID ) --- 182,201 ---- #ifdef MULTIHOMED struct uvldbentry uvldbEntry; #endif ! int method = -1; int ROcount = 0; long code; + enum volstatus rwNewstate = vl_online; + enum volstatus roNewstate = vl_online; + enum volstatus bkNewstate = vl_online; /* clear out old bindings */ ! if (volp->rw.serversp) ! cm_FreeServerList(&volp->rw.serversp, CM_FREESERVERLIST_DELETE); ! if (volp->ro.serversp) ! cm_FreeServerList(&volp->ro.serversp, CM_FREESERVERLIST_DELETE); ! if (volp->bk.serversp) ! cm_FreeServerList(&volp->bk.serversp, CM_FREESERVERLIST_DELETE); #ifdef AFS_FREELANCE_CLIENT if ( cellp->cellID == AFS_FAKE_ROOT_CELL_ID && atoi(volp->namep)==AFS_FAKE_ROOT_VOL_ID ) *************** *** 162,168 **** vldbEntry.flags |= VLF_RWEXISTS; vldbEntry.volumeId[0] = AFS_FAKE_ROOT_VOL_ID; code = 0; ! type = 0; } else #endif { --- 204,210 ---- vldbEntry.flags |= VLF_RWEXISTS; vldbEntry.volumeId[0] = AFS_FAKE_ROOT_VOL_ID; code = 0; ! method = 0; } else #endif { *************** *** 174,189 **** continue; #ifdef MULTIHOMED code = VL_GetEntryByNameU(connp->callp, volp->namep, &uvldbEntry); ! type = 2; if ( code == RXGEN_OPCODE ) #endif { code = VL_GetEntryByNameN(connp->callp, volp->namep, &nvldbEntry); ! type = 1; } if ( code == RXGEN_OPCODE ) { code = VL_GetEntryByNameO(connp->callp, volp->namep, &vldbEntry); ! type = 0; } } while (cm_Analyze(connp, userp, reqp, NULL, NULL, cellp->vlServersp, NULL, code)); code = cm_MapVLRPCError(code, reqp); --- 216,231 ---- continue; #ifdef MULTIHOMED code = VL_GetEntryByNameU(connp->callp, volp->namep, &uvldbEntry); ! method = 2; if ( code == RXGEN_OPCODE ) #endif { code = VL_GetEntryByNameN(connp->callp, volp->namep, &nvldbEntry); ! method = 1; } if ( code == RXGEN_OPCODE ) { code = VL_GetEntryByNameO(connp->callp, volp->namep, &vldbEntry); ! method = 0; } } while (cm_Analyze(connp, userp, reqp, NULL, NULL, cellp->vlServersp, NULL, code)); code = cm_MapVLRPCError(code, reqp); *************** *** 194,199 **** --- 236,281 ---- osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s SUCCESS", volp->cellp->name, volp->namep); } + + /* We can end up here with code == CM_ERROR_NOSUCHVOLUME if the base volume name + * does not exist but there might exist a .readonly volume. If the base name + * doesn't exist we will not care about the .backup that might be left behind + * since there should be no method to access it. + */ + if (code == CM_ERROR_NOSUCHVOLUME && volp->rw.ID == 0 && strlen(volp->namep) < (VL_MAXNAMELEN - 9)) { + char name[VL_MAXNAMELEN]; + + snprintf(name, VL_MAXNAMELEN, "%s.readonly", volp->namep); + + /* now we have volume structure locked and held; make RPC to fill it */ + osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s", volp->cellp->name, name); + do { + code = cm_ConnByMServers(cellp->vlServersp, userp, reqp, &connp); + if (code) + continue; + #ifdef MULTIHOMED + code = VL_GetEntryByNameU(connp->callp, name, &uvldbEntry); + method = 2; + if ( code == RXGEN_OPCODE ) + #endif + { + code = VL_GetEntryByNameN(connp->callp, name, &nvldbEntry); + method = 1; + } + if ( code == RXGEN_OPCODE ) { + code = VL_GetEntryByNameO(connp->callp, name, &vldbEntry); + method = 0; + } + } while (cm_Analyze(connp, userp, reqp, NULL, NULL, cellp->vlServersp, NULL, code)); + code = cm_MapVLRPCError(code, reqp); + if ( code ) + osi_Log3(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s FAILURE, code 0x%x", + volp->cellp->name, name, code); + else + osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s SUCCESS", + volp->cellp->name, name); + } + if (code == 0) { afs_int32 flags; afs_int32 nServers; *************** *** 202,209 **** afs_int32 bkID; afs_int32 serverNumber[NMAXNSERVERS]; afs_int32 serverFlags[NMAXNSERVERS]; ! switch ( type ) { case 0: flags = vldbEntry.flags; nServers = vldbEntry.nServers; --- 284,295 ---- afs_int32 bkID; afs_int32 serverNumber[NMAXNSERVERS]; afs_int32 serverFlags[NMAXNSERVERS]; + afs_int32 rwServers_alldown = 1; + afs_int32 roServers_alldown = 1; + afs_int32 bkServers_alldown = 1; + char name[VL_MAXNAMELEN]; ! switch ( method ) { case 0: flags = vldbEntry.flags; nServers = vldbEntry.nServers; *************** *** 214,219 **** --- 300,307 ---- serverFlags[i] = vldbEntry.serverFlags[i]; serverNumber[i] = vldbEntry.serverNumber[i]; } + strncpy(name, vldbEntry.name, VL_MAXNAMELEN); + name[VL_MAXNAMELEN - 1] = '\0'; break; case 1: flags = nvldbEntry.flags; *************** *** 225,230 **** --- 313,320 ---- serverFlags[i] = nvldbEntry.serverFlags[i]; serverNumber[i] = nvldbEntry.serverNumber[i]; } + strncpy(name, nvldbEntry.name, VL_MAXNAMELEN); + name[VL_MAXNAMELEN - 1] = '\0'; break; #ifdef MULTIHOMED case 2: *************** *** 274,297 **** } } nServers = j; /* update the server count */ break; #endif } /* decode the response */ lock_ObtainWrite(&cm_volumeLock); ! if (flags & VLF_RWEXISTS) ! volp->rwID = rwID; ! else ! volp->rwID = 0; ! if (flags & VLF_ROEXISTS) ! volp->roID = roID; ! else ! volp->roID = 0; ! if (flags & VLF_BACKEXISTS) ! volp->bkID = bkID; ! else ! volp->bkID = 0; lock_ReleaseWrite(&cm_volumeLock); for (i=0; inamep)) { ! size_t len; ! ! len = strlen(name); ! ! if (len >= 8 && strcmp(name + len - 7, ".backup") == 0) { ! name[len - 7] = '\0'; ! } else if (len >= 10 && strcmp(name + len - 9, ".readonly") == 0) { ! name[len - 9] = '\0'; ! } ! ! osi_Log2(afsd_logp, "cm_UpdateVolume name %s -> %s", volp->namep, name); ! ! if (volp->flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromNameHashTable(volp); ! ! strcpy(volp->namep, name); ! ! cm_AddVolumeToNameHashTable(volp); ! } ! ! if (flags & VLF_RWEXISTS) { ! if (volp->rw.ID != rwID) { ! if (volp->rw.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, RWVOL); ! volp->rw.ID = rwID; ! cm_AddVolumeToIDHashTable(volp, RWVOL); ! } ! } else { ! if (volp->rw.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, RWVOL); ! volp->rw.ID = 0; ! } ! if (flags & VLF_ROEXISTS) { ! if (volp->ro.ID != roID) { ! if (volp->ro.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, ROVOL); ! volp->ro.ID = roID; ! cm_AddVolumeToIDHashTable(volp, ROVOL); ! } ! } else { ! if (volp->ro.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, ROVOL); ! volp->ro.ID = 0; ! } ! if (flags & VLF_BACKEXISTS) { ! if (volp->bk.ID != bkID) { ! if (volp->bk.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, BACKVOL); ! volp->bk.ID = bkID; ! cm_AddVolumeToIDHashTable(volp, BACKVOL); ! } ! } else { ! if (volp->bk.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, BACKVOL); ! volp->bk.ID = 0; ! } lock_ReleaseWrite(&cm_volumeLock); for (i=0; irwServersp, tsrp); lock_ObtainWrite(&cm_serverLock); tsrp->refCount--; /* drop allocation reference */ lock_ReleaseWrite(&cm_serverLock); } if ((tflags & VLSF_ROVOL) && (flags & VLF_ROEXISTS)) { ! tsrp = cm_NewServerRef(tsp); ! cm_InsertServerList(&volp->roServersp, tsrp); lock_ObtainWrite(&cm_serverLock); tsrp->refCount--; /* drop allocation reference */ lock_ReleaseWrite(&cm_serverLock); ROcount++; } /* We don't use VLSF_BACKVOL !?! */ if ((tflags & VLSF_RWVOL) && (flags & VLF_BACKEXISTS)) { ! tsrp = cm_NewServerRef(tsp); ! cm_InsertServerList(&volp->bkServersp, tsrp); lock_ObtainWrite(&cm_serverLock); tsrp->refCount--; /* drop allocation reference */ lock_ReleaseWrite(&cm_serverLock); } /* Drop the reference obtained by cm_FindServer() */ cm_PutServer(tsp); --- 457,497 ---- * earlier in this function. */ if ((tflags & VLSF_RWVOL) && (flags & VLF_RWEXISTS)) { ! tsrp = cm_NewServerRef(tsp, rwID); ! cm_InsertServerList(&volp->rw.serversp, tsrp); ! lock_ObtainWrite(&cm_serverLock); tsrp->refCount--; /* drop allocation reference */ lock_ReleaseWrite(&cm_serverLock); + + if (!(tsp->flags & CM_SERVERFLAG_DOWN)) + rwServers_alldown = 0; } if ((tflags & VLSF_ROVOL) && (flags & VLF_ROEXISTS)) { ! tsrp = cm_NewServerRef(tsp, roID); ! cm_InsertServerList(&volp->ro.serversp, tsrp); lock_ObtainWrite(&cm_serverLock); tsrp->refCount--; /* drop allocation reference */ lock_ReleaseWrite(&cm_serverLock); ROcount++; + + if (!(tsp->flags & CM_SERVERFLAG_DOWN)) + roServers_alldown = 0; } /* We don't use VLSF_BACKVOL !?! */ + /* Because only the backup on the server holding the RW + * volume can be valid. This check prevents errors if a + * RW is moved but the old backup is not removed. + */ if ((tflags & VLSF_RWVOL) && (flags & VLF_BACKEXISTS)) { ! tsrp = cm_NewServerRef(tsp, bkID); ! cm_InsertServerList(&volp->bk.serversp, tsrp); lock_ObtainWrite(&cm_serverLock); tsrp->refCount--; /* drop allocation reference */ lock_ReleaseWrite(&cm_serverLock); + + if (!(tsp->flags & CM_SERVERFLAG_DOWN)) + bkServers_alldown = 0; } /* Drop the reference obtained by cm_FindServer() */ cm_PutServer(tsp); *************** *** 357,365 **** * lists are length 1. */ if (ROcount > 1) { ! cm_RandomizeServer(&volp->roServersp); } } return code; } --- 508,539 ---- * lists are length 1. */ if (ROcount > 1) { ! cm_RandomizeServer(&volp->ro.serversp); } + + rwNewstate = rwServers_alldown ? vl_alldown : vl_online; + roNewstate = roServers_alldown ? vl_alldown : vl_online; + bkNewstate = bkServers_alldown ? vl_alldown : vl_online; + } else { + rwNewstate = roNewstate = bkNewstate = vl_alldown; + } + + if (volp->rw.state != rwNewstate) { + if (volp->rw.ID) + cm_VolumeStatusNotification(volp, volp->rw.ID, volp->rw.state, rwNewstate); + volp->rw.state = rwNewstate; + } + if (volp->ro.state != roNewstate) { + if (volp->ro.ID) + cm_VolumeStatusNotification(volp, volp->ro.ID, volp->ro.state, roNewstate); + volp->ro.state = roNewstate; + } + if (volp->bk.state != bkNewstate) { + if (volp->bk.ID) + cm_VolumeStatusNotification(volp, volp->bk.ID, volp->bk.state, bkNewstate); + volp->bk.state = bkNewstate; } + return code; } *************** *** 372,397 **** } } ! long cm_GetVolumeByID(cm_cell_t *cellp, long volumeID, cm_user_t *userp, ! cm_req_t *reqp, cm_volume_t **outVolpp) { cm_volume_t *volp; ! char volNameString[100]; long code = 0; ! lock_ObtainWrite(&cm_volumeLock); ! for(volp = cm_data.allVolumesp; volp; volp=volp->nextp) { if (cellp == volp->cellp && ! ((unsigned) volumeID == volp->rwID || ! (unsigned) volumeID == volp->roID || ! (unsigned) volumeID == volp->bkID)) break; } /* hold the volume if we found it */ if (volp) ! volp->refCount++; ! lock_ReleaseWrite(&cm_volumeLock); /* return it held */ if (volp) { --- 546,609 ---- } } ! ! long cm_GetVolumeByID(cm_cell_t *cellp, afs_uint32 volumeID, cm_user_t *userp, ! cm_req_t *reqp, afs_uint32 flags, cm_volume_t **outVolpp) { cm_volume_t *volp; ! #ifdef SEARCH_ALL_VOLUMES ! cm_volume_t *volp2; ! #endif ! char volNameString[VL_MAXNAMELEN]; ! afs_uint32 hash; long code = 0; ! lock_ObtainRead(&cm_volumeLock); ! #ifdef SEARCH_ALL_VOLUMES ! for(volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { if (cellp == volp->cellp && ! ((unsigned) volumeID == volp->rw.ID || ! (unsigned) volumeID == volp->ro.ID || ! (unsigned) volumeID == volp->bk.ID)) break; } + volp2 = volp; + #endif /* SEARCH_ALL_VOLUMES */ + + hash = CM_VOLUME_ID_HASH(volumeID); + /* The volumeID can be any one of the three types. So we must + * search the hash table for all three types until we find it. + * We will search in the order of RO, RW, BK. + */ + for ( volp = cm_data.volumeROIDHashTablep[hash]; volp; volp = volp->ro.nextp) { + if ( cellp == volp->cellp && volumeID == volp->ro.ID ) + break; + } + if (!volp) { + /* try RW volumes */ + for ( volp = cm_data.volumeRWIDHashTablep[hash]; volp; volp = volp->rw.nextp) { + if ( cellp == volp->cellp && volumeID == volp->rw.ID ) + break; + } + } + if (!volp) { + /* try BK volumes */ + for ( volp = cm_data.volumeBKIDHashTablep[hash]; volp; volp = volp->bk.nextp) { + if ( cellp == volp->cellp && volumeID == volp->bk.ID ) + break; + } + } + + #ifdef SEARCH_ALL_VOLUMES + osi_assert(volp == volp2); + #endif + + lock_ReleaseRead(&cm_volumeLock); + /* hold the volume if we found it */ if (volp) ! cm_GetVolume(volp); /* return it held */ if (volp) { *************** *** 404,412 **** volp->flags &= ~CM_VOLUMEFLAG_RESET; } lock_ReleaseMutex(&volp->mx); ! if (code == 0) *outVolpp = volp; ! else cm_PutVolume(volp); return code; --- 616,628 ---- volp->flags &= ~CM_VOLUMEFLAG_RESET; } lock_ReleaseMutex(&volp->mx); ! if (code == 0) { *outVolpp = volp; ! ! lock_ObtainWrite(&cm_volumeLock); ! cm_AdjustVolumeLRU(volp); ! lock_ReleaseWrite(&cm_volumeLock); ! } else cm_PutVolume(volp); return code; *************** *** 415,453 **** /* otherwise, we didn't find it so consult the VLDB */ sprintf(volNameString, "%u", volumeID); code = cm_GetVolumeByName(cellp, volNameString, userp, reqp, ! 0, outVolpp); return code; } long cm_GetVolumeByName(struct cm_cell *cellp, char *volumeNamep, ! struct cm_user *userp, struct cm_req *reqp, ! long flags, cm_volume_t **outVolpp) { cm_volume_t *volp; ! long code = 0; ! ! lock_ObtainWrite(&cm_volumeLock); ! for (volp = cm_data.allVolumesp; volp; volp=volp->nextp) { ! if (cellp == volp->cellp && strcmp(volumeNamep, volp->namep) == 0) { break; } } ! ! /* otherwise, get from VLDB */ ! if (!volp) { if ( cm_data.currentVolumes >= cm_data.maxVolumes ) { ! for (volp = cm_data.allVolumesp; volp; volp=volp->nextp) { if ( volp->refCount == 0 ) { /* There is one we can re-use */ break; } } if (!volp) osi_panic("Exceeded Max Volumes", __FILE__, __LINE__); - } ! if (volp) { ! volp->rwID = volp->roID = volp->bkID = 0; volp->dotdotFid.cell = 0; volp->dotdotFid.volume = 0; volp->dotdotFid.unique = 0; --- 631,741 ---- /* otherwise, we didn't find it so consult the VLDB */ sprintf(volNameString, "%u", volumeID); code = cm_GetVolumeByName(cellp, volNameString, userp, reqp, ! flags, outVolpp); return code; } + long cm_GetVolumeByName(struct cm_cell *cellp, char *volumeNamep, ! struct cm_user *userp, struct cm_req *reqp, ! afs_uint32 flags, cm_volume_t **outVolpp) { cm_volume_t *volp; ! #ifdef SEARCH_ALL_VOLUMES ! cm_volume_t *volp2; ! #endif ! long code = 0; ! char name[VL_MAXNAMELEN]; ! size_t len; ! int type; ! afs_uint32 hash; ! ! strncpy(name, volumeNamep, VL_MAXNAMELEN); ! name[VL_MAXNAMELEN-1] = '\0'; ! len = strlen(name); ! ! if (len >= 8 && strcmp(name + len - 7, ".backup") == 0) { ! type = BACKVOL; ! name[len - 7] = '\0'; ! } else if (len >= 10 && strcmp(name + len - 9, ".readonly") == 0) { ! type = ROVOL; ! name[len - 9] = '\0'; ! } else { ! type = RWVOL; ! } ! ! lock_ObtainRead(&cm_volumeLock); ! #ifdef SEARCH_ALL_VOLUMES ! for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { ! if (cellp == volp->cellp && strcmp(name, volp->namep) == 0) { break; } } ! volp2 = volp; ! #endif /* SEARCH_ALL_VOLUMES */ ! ! hash = CM_VOLUME_NAME_HASH(name); ! for (volp = cm_data.volumeNameHashTablep[hash]; volp; volp = volp->nameNextp) { ! if (cellp == volp->cellp && strcmp(name, volp->namep) == 0) ! break; ! } ! ! #ifdef SEARCH_ALL_VOLUMES ! osi_assert(volp2 == volp); ! #endif ! ! if (!volp && (flags & CM_GETVOL_FLAG_CREATE)) { ! /* otherwise, get from VLDB */ ! if ( cm_data.currentVolumes >= cm_data.maxVolumes ) { ! ! #ifdef RECYCLE_FROM_ALL_VOLUMES_LIST ! for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { if ( volp->refCount == 0 ) { /* There is one we can re-use */ break; } } + #else + for ( volp = cm_data.volumeLRULastp; + volp; + volp = (cm_volume_t *) osi_QPrev(&volp->q)) + { + if ( volp->refCount == 0 ) { + /* There is one we can re-use */ + break; + } + } + #endif if (!volp) osi_panic("Exceeded Max Volumes", __FILE__, __LINE__); ! lock_ReleaseRead(&cm_volumeLock); ! lock_ObtainMutex(&volp->mx); ! lock_ObtainWrite(&cm_volumeLock); ! ! osi_Log2(afsd_logp, "Recycling Volume %s:%s", ! volp->cellp->name, volp->namep); ! ! if (volp->flags & CM_VOLUMEFLAG_IN_LRU_QUEUE) ! cm_RemoveVolumeFromLRU(volp); ! if (volp->flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromNameHashTable(volp); ! if (volp->rw.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, RWVOL); ! if (volp->ro.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, ROVOL); ! if (volp->bk.flags & CM_VOLUMEFLAG_IN_HASH) ! cm_RemoveVolumeFromIDHashTable(volp, BACKVOL); ! ! if (volp->rw.ID) ! cm_VolumeStatusNotification(volp, volp->rw.ID, volp->rw.state, vl_unknown); ! if (volp->ro.ID) ! cm_VolumeStatusNotification(volp, volp->ro.ID, volp->ro.state, vl_unknown); ! if (volp->bk.ID) ! cm_VolumeStatusNotification(volp, volp->bk.ID, volp->bk.state, vl_unknown); ! ! volp->rw.ID = volp->ro.ID = volp->bk.ID = 0; volp->dotdotFid.cell = 0; volp->dotdotFid.volume = 0; volp->dotdotFid.unique = 0; *************** *** 456,491 **** volp = &cm_data.volumeBaseAddress[cm_data.currentVolumes++]; memset(volp, 0, sizeof(cm_volume_t)); volp->magic = CM_VOLUME_MAGIC; ! volp->nextp = cm_data.allVolumesp; cm_data.allVolumesp = volp; lock_InitializeMutex(&volp->mx, "cm_volume_t mutex"); ! } volp->cellp = cellp; ! strncpy(volp->namep, volumeNamep, VL_MAXNAMELEN); volp->namep[VL_MAXNAMELEN-1] = '\0'; ! volp->refCount = 1; /* starts off held */ volp->flags = CM_VOLUMEFLAG_RESET; } else { ! volp->refCount++; } ! /* next should work since no one could have gotten ptr to this structure yet */ ! lock_ReleaseWrite(&cm_volumeLock); ! lock_ObtainMutex(&volp->mx); ! if (volp->flags & CM_VOLUMEFLAG_RESET) { code = cm_UpdateVolume(cellp, userp, reqp, volp); if (code == 0) volp->flags &= ~CM_VOLUMEFLAG_RESET; } ! if (code == 0) *outVolpp = volp; ! else cm_PutVolume(volp); - lock_ReleaseMutex(&volp->mx); return code; } --- 744,798 ---- volp = &cm_data.volumeBaseAddress[cm_data.currentVolumes++]; memset(volp, 0, sizeof(cm_volume_t)); volp->magic = CM_VOLUME_MAGIC; ! volp->allNextp = cm_data.allVolumesp; cm_data.allVolumesp = volp; lock_InitializeMutex(&volp->mx, "cm_volume_t mutex"); ! lock_ReleaseRead(&cm_volumeLock); ! lock_ObtainMutex(&volp->mx); ! lock_ObtainWrite(&cm_volumeLock); ! } volp->cellp = cellp; ! strncpy(volp->namep, name, VL_MAXNAMELEN); volp->namep[VL_MAXNAMELEN-1] = '\0'; ! volp->refCount = 1; /* starts off held */ volp->flags = CM_VOLUMEFLAG_RESET; + volp->rw.state = volp->ro.state = volp->bk.state = vl_unknown; + volp->rw.nextp = volp->ro.nextp = volp->bk.nextp = NULL; + volp->rw.flags = volp->ro.flags = volp->bk.flags = 0; + cm_AddVolumeToNameHashTable(volp); + lock_ReleaseWrite(&cm_volumeLock); } else { ! lock_ReleaseRead(&cm_volumeLock); ! if (volp) { ! cm_GetVolume(volp); ! lock_ObtainMutex(&volp->mx); ! } else { ! return CM_ERROR_NOSUCHVOLUME; ! } } ! /* if we get here we are holding the mutex */ if (volp->flags & CM_VOLUMEFLAG_RESET) { code = cm_UpdateVolume(cellp, userp, reqp, volp); if (code == 0) volp->flags &= ~CM_VOLUMEFLAG_RESET; } + lock_ReleaseMutex(&volp->mx); ! if (code == 0 && (type == BACKVOL && volp->bk.ID == 0 || ! type == ROVOL && volp->ro.ID == 0)) ! code = CM_ERROR_NOSUCHVOLUME; ! ! if (code == 0) { *outVolpp = volp; ! ! lock_ObtainWrite(&cm_volumeLock); ! cm_AdjustVolumeLRU(volp); ! lock_ReleaseWrite(&cm_volumeLock); ! } else cm_PutVolume(volp); return code; } *************** *** 493,498 **** --- 800,809 ---- { cm_cell_t *cellp; cm_volume_t *volp; + #ifdef SEARCH_ALL_VOLUMES + cm_volume_t *volp2; + #endif + afs_uint32 hash; if (!fidp) return; *************** *** 500,518 **** if (!cellp) return; /* search for the volume */ ! lock_ObtainWrite(&cm_volumeLock); ! for(volp = cm_data.allVolumesp; volp; volp=volp->nextp) { if (cellp == volp->cellp && ! (fidp->volume == volp->rwID || ! fidp->volume == volp->roID || ! fidp->volume == volp->bkID)) break; } /* hold the volume if we found it */ if (volp) ! volp->refCount++; ! lock_ReleaseWrite(&cm_volumeLock); /* update it */ cm_data.mountRootGen = time(NULL); --- 811,860 ---- if (!cellp) return; /* search for the volume */ ! lock_ObtainRead(&cm_volumeLock); ! #ifdef SEARCH_ALL_VOLUMES ! for(volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { if (cellp == volp->cellp && ! (fidp->volume == volp->rw.ID || ! fidp->volume == volp->ro.ID || ! fidp->volume == volp->bk.ID)) break; } + #endif /* SEARCH_ALL_VOLUMES */ + + hash = CM_VOLUME_ID_HASH(fidp->volume); + /* The volumeID can be any one of the three types. So we must + * search the hash table for all three types until we find it. + * We will search in the order of RO, RW, BK. + */ + for ( volp = cm_data.volumeROIDHashTablep[hash]; volp; volp = volp->ro.nextp) { + if ( cellp == volp->cellp && fidp->volume == volp->ro.ID ) + break; + } + if (!volp) { + /* try RW volumes */ + for ( volp = cm_data.volumeRWIDHashTablep[hash]; volp; volp = volp->rw.nextp) { + if ( cellp == volp->cellp && fidp->volume == volp->rw.ID ) + break; + } + } + if (!volp) { + /* try BK volumes */ + for ( volp = cm_data.volumeBKIDHashTablep[hash]; volp; volp = volp->bk.nextp) { + if ( cellp == volp->cellp && fidp->volume == volp->bk.ID ) + break; + } + } + + #ifdef SEARCH_ALL_VOLUMES + osi_assert(volp == volp2); + #endif + + lock_ReleaseRead(&cm_volumeLock); /* hold the volume if we found it */ if (volp) ! cm_GetVolume(volp); /* update it */ cm_data.mountRootGen = time(NULL); *************** *** 539,557 **** } /* find the appropriate servers from a volume */ ! cm_serverRef_t **cm_GetVolServers(cm_volume_t *volp, unsigned long volume) { cm_serverRef_t **serverspp; cm_serverRef_t *current;; lock_ObtainWrite(&cm_serverLock); ! if (volume == volp->rwID) ! serverspp = &volp->rwServersp; ! else if (volume == volp->roID) ! serverspp = &volp->roServersp; ! else if (volume == volp->bkID) ! serverspp = &volp->bkServersp; else osi_panic("bad volume ID in cm_GetVolServers", __FILE__, __LINE__); --- 881,899 ---- } /* find the appropriate servers from a volume */ ! cm_serverRef_t **cm_GetVolServers(cm_volume_t *volp, afs_uint32 volume) { cm_serverRef_t **serverspp; cm_serverRef_t *current;; lock_ObtainWrite(&cm_serverLock); ! if (volume == volp->rw.ID) ! serverspp = &volp->rw.serversp; ! else if (volume == volp->ro.ID) ! serverspp = &volp->ro.serversp; ! else if (volume == volp->bk.ID) ! serverspp = &volp->bk.serversp; else osi_panic("bad volume ID in cm_GetVolServers", __FILE__, __LINE__); *************** *** 578,587 **** long id; lock_ObtainMutex(&volp->mx); ! if (volp->roID && volp->roServersp) ! id = volp->roID; else ! id = volp->rwID; lock_ReleaseMutex(&volp->mx); return id; --- 920,929 ---- long id; lock_ObtainMutex(&volp->mx); ! if (volp->ro.ID && volp->ro.serversp) ! id = volp->ro.ID; else ! id = volp->rw.ID; lock_ReleaseMutex(&volp->mx); return id; *************** *** 596,610 **** /* force a re-loading of volume data from the vldb */ lock_ObtainWrite(&cm_volumeLock); ! for (volp = cm_data.allVolumesp; volp; volp=volp->nextp) { volp->refCount++; lock_ReleaseWrite(&cm_volumeLock); - lock_ObtainMutex(&volp->mx); volp->flags |= CM_VOLUMEFLAG_RESET; - lock_ReleaseMutex(&volp->mx); ! lock_ObtainWrite(&cm_volumeLock); osi_assert(volp->refCount-- > 0); } lock_ReleaseWrite(&cm_volumeLock); --- 938,952 ---- /* force a re-loading of volume data from the vldb */ lock_ObtainWrite(&cm_volumeLock); ! for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { volp->refCount++; lock_ReleaseWrite(&cm_volumeLock); + lock_ObtainMutex(&volp->mx); volp->flags |= CM_VOLUMEFLAG_RESET; lock_ReleaseMutex(&volp->mx); ! ! lock_ObtainWrite(&cm_volumeLock); osi_assert(volp->refCount-- > 0); } lock_ReleaseWrite(&cm_volumeLock); *************** *** 629,634 **** --- 971,1174 ---- } + + /* The return code is 0 if the volume is not online and + * 1 if the volume is online + */ + long + cm_CheckOfflineVolume(cm_volume_t *volp, afs_uint32 volID) + { + cm_conn_t *connp; + long code; + AFSFetchVolumeStatus volStat; + char *Name; + char *OfflineMsg; + char *MOTD; + cm_req_t req; + struct rx_connection * callp; + char volName[32]; + char offLineMsg[256]; + char motd[256]; + long online = 0; + cm_serverRef_t *serversp; + + Name = volName; + OfflineMsg = offLineMsg; + MOTD = motd; + + lock_ObtainMutex(&volp->mx); + + if (volp->rw.ID != 0 && (!volID || volID == volp->rw.ID) && + (volp->rw.state == vl_busy || volp->rw.state == vl_offline)) { + cm_InitReq(&req); + + for (serversp = volp->rw.serversp; serversp; serversp = serversp->next) { + if (serversp->status == srv_busy || serversp->status == srv_offline) + serversp->status = srv_not_busy; + } + + do { + code = cm_ConnFromVolume(volp, volp->rw.ID, cm_rootUserp, &req, &connp); + if (code) + continue; + + callp = cm_GetRxConn(connp); + code = RXAFS_GetVolumeStatus(callp, volp->rw.ID, + &volStat, &Name, &OfflineMsg, &MOTD); + rx_PutConnection(callp); + + } while (cm_Analyze(connp, cm_rootUserp, &req, NULL, NULL, NULL, NULL, code)); + code = cm_MapRPCError(code, &req); + + if (code == 0 && volStat.Online) { + cm_VolumeStatusNotification(volp, volp->rw.ID, volp->rw.state, vl_online); + volp->rw.state = vl_online; + online = 1; + } + } + + if (volp->ro.ID != 0 && (!volID || volID == volp->ro.ID) && + (volp->ro.state == vl_busy || volp->ro.state == vl_offline)) { + cm_InitReq(&req); + + for (serversp = volp->ro.serversp; serversp; serversp = serversp->next) { + if (serversp->status == srv_busy || serversp->status == srv_offline) + serversp->status = srv_not_busy; + } + + do { + code = cm_ConnFromVolume(volp, volp->ro.ID, cm_rootUserp, &req, &connp); + if (code) + continue; + + callp = cm_GetRxConn(connp); + code = RXAFS_GetVolumeStatus(callp, volp->ro.ID, + &volStat, &Name, &OfflineMsg, &MOTD); + rx_PutConnection(callp); + + } while (cm_Analyze(connp, cm_rootUserp, &req, NULL, NULL, NULL, NULL, code)); + code = cm_MapRPCError(code, &req); + + if (code == 0 && volStat.Online) { + cm_VolumeStatusNotification(volp, volp->ro.ID, volp->ro.state, vl_online); + volp->ro.state = vl_online; + online = 1; + } + } + + if (volp->bk.ID != 0 && (!volID || volID == volp->bk.ID) && + (volp->bk.state == vl_busy || volp->bk.state == vl_offline)) { + cm_InitReq(&req); + + for (serversp = volp->bk.serversp; serversp; serversp = serversp->next) { + if (serversp->status == srv_busy || serversp->status == srv_offline) + serversp->status = srv_not_busy; + } + + do { + code = cm_ConnFromVolume(volp, volp->bk.ID, cm_rootUserp, &req, &connp); + if (code) + continue; + + callp = cm_GetRxConn(connp); + code = RXAFS_GetVolumeStatus(callp, volp->bk.ID, + &volStat, &Name, &OfflineMsg, &MOTD); + rx_PutConnection(callp); + + } while (cm_Analyze(connp, cm_rootUserp, &req, NULL, NULL, NULL, NULL, code)); + code = cm_MapRPCError(code, &req); + + if (code == 0 && volStat.Online) { + cm_VolumeStatusNotification(volp, volp->bk.ID, volp->bk.state, vl_online); + volp->bk.state = vl_online; + online = 1; + } + } + + lock_ReleaseMutex(&volp->mx); + return online; + } + + + /* called from the Daemon thread */ + void cm_CheckOfflineVolumes(void) + { + cm_volume_t *volp; + + lock_ObtainWrite(&cm_volumeLock); + for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { + volp->refCount++; + lock_ReleaseWrite(&cm_volumeLock); + + cm_CheckOfflineVolume(volp, 0); + + lock_ObtainWrite(&cm_volumeLock); + osi_assert(volp->refCount-- > 0); + } + lock_ReleaseWrite(&cm_volumeLock); + } + + void + cm_UpdateVolumeStatus(cm_volume_t *volp, afs_uint32 volID) + { + struct cm_vol_state * statep = NULL; + enum volstatus newStatus; + cm_serverRef_t *tsrp; + cm_server_t *tsp; + int someBusy = 0, someOffline = 0, allOffline = 1, allBusy = 1, allDown = 1; + + if (volp->rw.ID == volID) { + statep = &volp->rw; + } else if (volp->ro.ID == volID) { + statep = &volp->ro; + } else if (volp->bk.ID == volID) { + statep = &volp->bk; + } + + if (!statep) { + #ifdef DEBUG + DebugBreak(); + #endif + return; + } + + lock_ObtainWrite(&cm_serverLock); + for (tsrp = statep->serversp; tsrp; tsrp=tsrp->next) { + tsp = tsrp->server; + cm_GetServerNoLock(tsp); + if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { + allDown = 0; + if (tsrp->status == srv_busy) { + allOffline = 0; + someBusy = 1; + } else if (tsrp->status == srv_offline) { + allBusy = 0; + someOffline = 1; + } else { + allOffline = 0; + allBusy = 0; + } + } + cm_PutServerNoLock(tsp); + } + lock_ReleaseWrite(&cm_serverLock); + + if (allDown) + newStatus = vl_alldown; + else if (allBusy || (someBusy && someOffline)) + newStatus = vl_busy; + else if (allOffline) + newStatus = vl_offline; + else + newStatus = vl_online; + + + if (statep->ID && statep->state != newStatus) + cm_VolumeStatusNotification(volp, statep->ID, statep->state, newStatus); + + statep->state = newStatus; + } + /* ** Finds all volumes that reside on this server and reorders their ** RO list according to the changed rank of server. *************** *** 640,658 **** /* find volumes which might have RO copy on server*/ lock_ObtainWrite(&cm_volumeLock); ! for(volp = cm_data.allVolumesp; volp; volp=volp->nextp) { code = 1 ; /* assume that list is unchanged */ volp->refCount++; lock_ReleaseWrite(&cm_volumeLock); lock_ObtainMutex(&volp->mx); ! if ((tsp->cellp==volp->cellp) && (volp->roServersp)) ! code =cm_ChangeRankServer(&volp->roServersp, tsp); /* this volume list was changed */ if ( !code ) ! cm_RandomizeServer(&volp->roServersp); lock_ReleaseMutex(&volp->mx); lock_ObtainWrite(&cm_volumeLock); --- 1180,1198 ---- /* find volumes which might have RO copy on server*/ lock_ObtainWrite(&cm_volumeLock); ! for(volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { code = 1 ; /* assume that list is unchanged */ volp->refCount++; lock_ReleaseWrite(&cm_volumeLock); lock_ObtainMutex(&volp->mx); ! if ((tsp->cellp==volp->cellp) && (volp->ro.serversp)) ! code =cm_ChangeRankServer(&volp->ro.serversp, tsp); /* this volume list was changed */ if ( !code ) ! cm_RandomizeServer(&volp->ro.serversp); lock_ReleaseMutex(&volp->mx); lock_ObtainWrite(&cm_volumeLock); *************** *** 661,667 **** lock_ReleaseWrite(&cm_volumeLock); } ! /* dump all scp's that have reference count > 0 to a file. * cookie is used to identify this batch for easy parsing, * and it a string provided by a caller */ --- 1201,1207 ---- lock_ReleaseWrite(&cm_volumeLock); } ! /* dump all volumes that have reference count > 0 to a file. * cookie is used to identify this batch for easy parsing, * and it a string provided by a caller */ *************** *** 679,703 **** sprintf(output, "%s - dumping volumes - cm_data.currentVolumes=%d, cm_data.maxVolumes=%d\r\n", cookie, cm_data.currentVolumes, cm_data.maxVolumes); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! for (volp = cm_data.allVolumesp; volp; volp=volp->nextp) { ! if (volp->refCount != 0) ! { ! cm_scache_t *scp; ! int scprefs = 0; ! ! for (scp = cm_data.scacheLRULastp; scp; scp = (cm_scache_t *) osi_QPrev(&scp->q)) ! { ! if (scp->volp == volp) ! scprefs++; ! } ! sprintf(output, "%s cell=%s name=%s rwID=%u roID=%u bkID=%u flags=0x%x fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u scpRefs=%u\r\n", ! cookie, volp->cellp->name, volp->namep, volp->rwID, volp->roID, volp->bkID, volp->flags, ! volp->dotdotFid.cell, volp->dotdotFid.volume, volp->dotdotFid.vnode, volp->dotdotFid.unique, ! volp->refCount, scprefs); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! } } sprintf(output, "%s - Done dumping volumes.\r\n", cookie); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); --- 1219,1240 ---- sprintf(output, "%s - dumping volumes - cm_data.currentVolumes=%d, cm_data.maxVolumes=%d\r\n", cookie, cm_data.currentVolumes, cm_data.maxVolumes); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) { ! cm_scache_t *scp; ! int scprefs = 0; ! for (scp = cm_data.allSCachesp; scp; scp = scp->allNextp) ! { ! if (scp->volp == volp) ! scprefs++; ! } ! ! sprintf(output, "%s - volp=0x%p cell=%s name=%s rwID=%u roID=%u bkID=%u flags=0x%x fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u scpRefs=%u\r\n", ! cookie, volp, volp->cellp->name, volp->namep, volp->rw.ID, volp->ro.ID, volp->bk.ID, volp->flags, ! volp->dotdotFid.cell, volp->dotdotFid.volume, volp->dotdotFid.vnode, volp->dotdotFid.unique, ! volp->refCount, scprefs); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } sprintf(output, "%s - Done dumping volumes.\r\n", cookie); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); *************** *** 710,712 **** --- 1247,1477 ---- } + /* + * String hash function used by SDBM project. + * It was chosen because it is fast and provides + * decent coverage. + */ + afs_uint32 SDBMHash(const char * str) + { + afs_uint32 hash = 0; + size_t i, len; + + if (str == NULL) + return 0; + + for(i = 0, len = strlen(str); i < len; i++) + { + hash = str[i] + (hash << 6) + (hash << 16) - hash; + } + + return (hash & 0x7FFFFFFF); + } + + /* call with volume write-locked and mutex held */ + void cm_AddVolumeToNameHashTable(cm_volume_t *volp) + { + int i; + + if (volp->flags & CM_VOLUMEFLAG_IN_HASH) + return; + + i = CM_VOLUME_NAME_HASH(volp->namep); + + volp->nameNextp = cm_data.volumeNameHashTablep[i]; + cm_data.volumeNameHashTablep[i] = volp; + volp->flags |= CM_VOLUMEFLAG_IN_HASH; + } + + /* call with volume write-locked and mutex held */ + void cm_RemoveVolumeFromNameHashTable(cm_volume_t *volp) + { + cm_volume_t **lvolpp; + cm_volume_t *tvolp; + int i; + + if (volp->flags & CM_VOLUMEFLAG_IN_HASH) { + /* hash it out first */ + i = CM_VOLUME_NAME_HASH(volp->namep); + for (lvolpp = &cm_data.volumeNameHashTablep[i], tvolp = cm_data.volumeNameHashTablep[i]; + tvolp; + lvolpp = &tvolp->nameNextp, tvolp = tvolp->nameNextp) { + if (tvolp == volp) { + *lvolpp = volp->nameNextp; + volp->flags &= ~CM_VOLUMEFLAG_IN_HASH; + volp->nameNextp = NULL; + break; + } + } + } + } + + /* call with volume write-locked and mutex held */ + void cm_AddVolumeToIDHashTable(cm_volume_t *volp, afs_uint32 volType) + { + int i; + struct cm_vol_state * statep; + + switch (volType) { + case RWVOL: + statep = &volp->rw; + break; + case ROVOL: + statep = &volp->ro; + break; + case BACKVOL: + statep = &volp->bk; + break; + default: + return; + } + + if (statep->flags & CM_VOLUMEFLAG_IN_HASH) + return; + + i = CM_VOLUME_ID_HASH(statep->ID); + + switch (volType) { + case RWVOL: + statep->nextp = cm_data.volumeRWIDHashTablep[i]; + cm_data.volumeRWIDHashTablep[i] = volp; + break; + case ROVOL: + statep->nextp = cm_data.volumeROIDHashTablep[i]; + cm_data.volumeROIDHashTablep[i] = volp; + break; + case BACKVOL: + statep->nextp = cm_data.volumeBKIDHashTablep[i]; + cm_data.volumeBKIDHashTablep[i] = volp; + break; + } + statep->flags |= CM_VOLUMEFLAG_IN_HASH; + } + + + /* call with volume write-locked and mutex held */ + void cm_RemoveVolumeFromIDHashTable(cm_volume_t *volp, afs_uint32 volType) + { + cm_volume_t **lvolpp; + cm_volume_t *tvolp; + struct cm_vol_state * statep; + int i; + + switch (volType) { + case RWVOL: + statep = &volp->rw; + break; + case ROVOL: + statep = &volp->ro; + break; + case BACKVOL: + statep = &volp->bk; + break; + default: + return; + } + + if (statep->flags & CM_VOLUMEFLAG_IN_HASH) { + /* hash it out first */ + i = CM_VOLUME_ID_HASH(statep->ID); + + switch (volType) { + case RWVOL: + lvolpp = &cm_data.volumeRWIDHashTablep[i]; + tvolp = cm_data.volumeRWIDHashTablep[i]; + break; + case ROVOL: + lvolpp = &cm_data.volumeROIDHashTablep[i]; + tvolp = cm_data.volumeROIDHashTablep[i]; + break; + case BACKVOL: + lvolpp = &cm_data.volumeBKIDHashTablep[i]; + tvolp = cm_data.volumeBKIDHashTablep[i]; + break; + } + do { + if (tvolp == volp) { + *lvolpp = statep->nextp; + statep->flags &= ~CM_VOLUMEFLAG_IN_HASH; + statep->nextp = NULL; + break; + } + + switch (volType) { + case RWVOL: + lvolpp = &tvolp->rw.nextp; + tvolp = tvolp->rw.nextp; + break; + case ROVOL: + lvolpp = &tvolp->ro.nextp; + tvolp = tvolp->ro.nextp; + break; + case BACKVOL: + lvolpp = &tvolp->bk.nextp; + tvolp = tvolp->bk.nextp; + break; + } + } while(tvolp); + } + } + + /* must be called with cm_volumeLock write-locked! */ + void cm_AdjustVolumeLRU(cm_volume_t *volp) + { + if (volp == cm_data.volumeLRULastp) + cm_data.volumeLRULastp = (cm_volume_t *) osi_QPrev(&volp->q); + if (volp->flags & CM_VOLUMEFLAG_IN_LRU_QUEUE) + osi_QRemoveHT((osi_queue_t **) &cm_data.volumeLRUFirstp, (osi_queue_t **) &cm_data.volumeLRULastp, &volp->q); + osi_QAdd((osi_queue_t **) &cm_data.volumeLRUFirstp, &volp->q); + volp->flags |= CM_VOLUMEFLAG_IN_LRU_QUEUE; + if (!cm_data.volumeLRULastp) + cm_data.volumeLRULastp = volp; + } + + /* must be called with cm_volumeLock write-locked! */ + void cm_RemoveVolumeFromLRU(cm_volume_t *volp) + { + if (volp->flags & CM_VOLUMEFLAG_IN_LRU_QUEUE) { + if (volp == cm_data.volumeLRULastp) + cm_data.volumeLRULastp = (cm_volume_t *) osi_QPrev(&volp->q); + osi_QRemoveHT((osi_queue_t **) &cm_data.volumeLRUFirstp, (osi_queue_t **) &cm_data.volumeLRULastp, &volp->q); + volp->flags &= ~CM_VOLUMEFLAG_IN_LRU_QUEUE; + } + } + + static char * volstatus_str(enum volstatus vs) + { + switch (vs) { + case vl_online: + return "online"; + case vl_busy: + return "busy"; + case vl_offline: + return "offline"; + case vl_alldown: + return "alldown"; + default: + return "unknown"; + } + } + + void cm_VolumeStatusNotification(cm_volume_t * volp, afs_uint32 volID, enum volstatus old, enum volstatus new) + { + char volstr[CELL_MAXNAMELEN + VL_MAXNAMELEN]; + char *ext = ""; + + if (volID == volp->rw.ID) + ext = ""; + else if (volID == volp->ro.ID) + ext = ".readonly"; + else if (volID == volp->bk.ID) + ext = ".backup"; + else + ext = ".nomatch"; + snprintf(volstr, sizeof(volstr), "%s:%s%s", volp->cellp->name, volp->namep, ext); + + osi_Log4(afsd_logp, "VolumeStatusNotification: %-48s [%10u] (%s -> %s)", + volstr, volID, volstatus_str(old), volstatus_str(new)); + + cm_VolStatus_Change_Notification(volp->cellp->cellID, volID, new); + } Index: openafs/src/WINNT/afsd/cm_volume.h diff -c openafs/src/WINNT/afsd/cm_volume.h:1.5.6.2 openafs/src/WINNT/afsd/cm_volume.h:1.5.6.4 *** openafs/src/WINNT/afsd/cm_volume.h:1.5.6.2 Sat Feb 3 21:46:25 2007 --- openafs/src/WINNT/afsd/cm_volume.h Tue Jun 12 11:38:43 2007 *************** *** 14,45 **** #define CM_VOLUME_MAGIC ('V' | 'O' <<8 | 'L'<<16 | 'M'<<24) typedef struct cm_volume { afs_uint32 magic; cm_cell_t *cellp; /* never changes */ ! char namep[VL_MAXNAMELEN]; /* by cm_volumeLock */ ! unsigned long rwID; /* by cm_volumeLock */ ! unsigned long roID; /* by cm_volumeLock */ ! unsigned long bkID; /* by cm_volumeLock */ ! struct cm_volume *nextp; /* by cm_volumeLock */ struct cm_fid dotdotFid; /* parent of volume root */ osi_mutex_t mx; ! long flags; /* by mx */ ! unsigned long refCount; /* by cm_volumeLock */ ! cm_serverRef_t *rwServersp; /* by mx */ ! cm_serverRef_t *roServersp; /* by mx */ ! cm_serverRef_t *bkServersp; /* by mx */ } cm_volume_t; ! #define CM_VOLUMEFLAG_RESET 1 /* reload this info on next use */ extern void cm_InitVolume(int newFile, long maxVols); ! extern long cm_GetVolumeByName(struct cm_cell *, char *, struct cm_user *, ! struct cm_req *, long, cm_volume_t **); ! extern long cm_GetVolumeByID(struct cm_cell *cellp, long volumeID, ! cm_user_t *userp, cm_req_t *reqp, cm_volume_t **outVolpp); extern void cm_GetVolume(cm_volume_t *volp); --- 14,79 ---- #define CM_VOLUME_MAGIC ('V' | 'O' <<8 | 'L'<<16 | 'M'<<24) + enum volstatus {vl_online, vl_busy, vl_offline, vl_alldown, vl_unknown}; + + typedef struct cm_vol_state { + afs_uint32 ID; /* by mx */ + struct cm_volume *nextp; /* volumeIDHashTable; by cm_volumeLock */ + cm_serverRef_t *serversp; /* by mx */ + enum volstatus state; /* by mx */ + afs_uint32 flags; /* by mx */ + } cm_vol_state_t; + typedef struct cm_volume { + osi_queue_t q; /* LRU queue; cm_volumeLock */ afs_uint32 magic; + struct cm_volume *allNextp; /* allVolumes; by cm_volumeLock */ + struct cm_volume *nameNextp; /* volumeNameHashTable; by cm_volumeLock */ cm_cell_t *cellp; /* never changes */ ! char namep[VL_MAXNAMELEN]; /* name of the normal volume - assigned during allocation; */ ! /* by cm_volumeLock */ ! struct cm_vol_state rw; /* by cm_volumeLock */ ! struct cm_vol_state ro; /* by cm_volumeLock */ ! struct cm_vol_state bk; /* by cm_volumeLock */ struct cm_fid dotdotFid; /* parent of volume root */ osi_mutex_t mx; ! afs_uint32 flags; /* by mx */ ! afs_uint32 refCount; /* by cm_volumeLock */ } cm_volume_t; ! #define CM_VOLUMEFLAG_RESET 1 /* reload this info on next use */ ! #define CM_VOLUMEFLAG_IN_HASH 2 ! #define CM_VOLUMEFLAG_IN_LRU_QUEUE 4 ! ! ! typedef struct cm_volumeRef { ! struct cm_volumeRef * next; ! afs_uint32 volID; ! } cm_volumeRef_t; extern void cm_InitVolume(int newFile, long maxVols); ! extern long cm_GetVolumeByName(struct cm_cell *cellp, char *volNamep, ! struct cm_user *userp, struct cm_req *reqp, ! afs_uint32 flags, cm_volume_t **outVolpp); ! ! extern long cm_GetVolumeByID(struct cm_cell *cellp, afs_uint32 volumeID, ! cm_user_t *userp, cm_req_t *reqp, ! afs_uint32 flags, cm_volume_t **outVolpp); ! ! #define CM_GETVOL_FLAG_CREATE 1 ! #define CM_GETVOL_FLAG_NO_LRU_UPDATE 2 ! ! /* hash define. Must not include the cell, since the callback revocation code ! * doesn't necessarily know the cell in the case of a multihomed server ! * contacting us from a mystery address. ! */ ! #define CM_VOLUME_ID_HASH(volid) ((unsigned long) volid \ ! % cm_data.volumeHashTableSize) ! ! #define CM_VOLUME_NAME_HASH(name) (SDBMHash(name) % cm_data.volumeHashTableSize) ! extern afs_uint32 SDBMHash(const char *); extern void cm_GetVolume(cm_volume_t *volp); *************** *** 50,56 **** extern void cm_ForceUpdateVolume(struct cm_fid *fidp, cm_user_t *userp, cm_req_t *reqp); ! extern cm_serverRef_t **cm_GetVolServers(cm_volume_t *volp, unsigned long volume); extern void cm_ChangeRankVolume(cm_server_t *tsp); --- 84,90 ---- extern void cm_ForceUpdateVolume(struct cm_fid *fidp, cm_user_t *userp, cm_req_t *reqp); ! extern cm_serverRef_t **cm_GetVolServers(cm_volume_t *volp, afs_uint32 volume); extern void cm_ChangeRankVolume(cm_server_t *tsp); *************** *** 61,64 **** --- 95,121 ---- extern long cm_ShutdownVolume(void); extern int cm_DumpVolumes(FILE *outputFile, char *cookie, int lock); + + extern int cm_VolNameIsID(char *aname); + + extern void cm_RemoveVolumeFromNameHashTable(cm_volume_t * volp); + + extern void cm_RemoveVolumeFromIDHashTable(cm_volume_t * volp, afs_uint32 volType); + + extern void cm_AddVolumeToNameHashTable(cm_volume_t * volp); + + extern void cm_AddVolumeToIDHashTable(cm_volume_t * volp, afs_uint32 volType); + + extern void cm_AdjustVolumeLRU(cm_volume_t *volp); + + extern void cm_RemoveVolumeFromLRU(cm_volume_t *volp); + + extern void cm_CheckOfflineVolumes(void); + + extern long cm_CheckOfflineVolume(cm_volume_t *volp, afs_uint32 volID); + + extern void cm_UpdateVolumeStatus(cm_volume_t *volp, afs_uint32 volID); + + extern void cm_VolumeStatusNotification(cm_volume_t * volp, afs_uint32 volID, enum volstatus old, enum volstatus new); + #endif /* __CM_VOLUME_H_ENV__ */ Index: openafs/src/WINNT/afsd/fs.c diff -c openafs/src/WINNT/afsd/fs.c:1.32.4.9 openafs/src/WINNT/afsd/fs.c:1.32.4.11 *** openafs/src/WINNT/afsd/fs.c:1.32.4.9 Tue May 15 16:20:55 2007 --- openafs/src/WINNT/afsd/fs.c Mon Jul 2 20:35:13 2007 *************** *** 271,277 **** code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1); if (code == 0) ! return !strcmp("Freelance.Local.Root",space); return 1; /* assume it is because it is more restrictive that way */ } --- 271,277 ---- code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1); if (code == 0) ! return !stricmp("Freelance.Local.Root",space); return 1; /* assume it is because it is more restrictive that way */ } *************** *** 4639,4648 **** else if (code == ENODEV) { fprintf(stderr,"%s: AFS service may not have started.\n", pn); } ! else if (code == ESRCH) { fprintf(stderr,"%s: Cell name not recognized.\n", pn); } ! else if (code == EPIPE) { fprintf(stderr,"%s: Volume name or ID not recognized.\n", pn); } else if (code == EFBIG) { --- 4639,4648 ---- else if (code == ENODEV) { fprintf(stderr,"%s: AFS service may not have started.\n", pn); } ! else if (code == ESRCH) { /* hack */ fprintf(stderr,"%s: Cell name not recognized.\n", pn); } ! else if (code == EPIPE) { /* hack */ fprintf(stderr,"%s: Volume name or ID not recognized.\n", pn); } else if (code == EFBIG) { *************** *** 4654,4659 **** --- 4654,4677 ---- else fprintf(stderr,"%s: Connection timed out", pn); } + else if (code == EBUSY) { + if (filename) + fprintf(stderr,"%s: All servers are busy on which '%s' resides\n", pn, filename); + else + fprintf(stderr,"%s: All servers are busy\n", pn); + } + else if (code == ENXIO) { + if (filename) + fprintf(stderr,"%s: All volume instances are offline on which '%s' resides\n", pn, filename); + else + fprintf(stderr,"%s: All volume instances are offline\n", pn); + } + else if (code == ENOSYS) { + if (filename) + fprintf(stderr,"%s: All servers are down on which '%s' resides\n", pn, filename); + else + fprintf(stderr,"%s: All servers are down\n", pn); + } else { if (filename) fprintf(stderr,"%s:'%s'", pn, filename); Index: openafs/src/WINNT/afsd/lanahelper.cpp diff -c openafs/src/WINNT/afsd/lanahelper.cpp:1.12.2.3 openafs/src/WINNT/afsd/lanahelper.cpp:1.12.2.4 *** openafs/src/WINNT/afsd/lanahelper.cpp:1.12.2.3 Tue Feb 27 19:42:05 2007 --- openafs/src/WINNT/afsd/lanahelper.cpp Tue Jun 19 01:25:40 2007 *************** *** 439,445 **** --- 439,447 ---- } astat; unsigned char kWLA_MAC[6] = { 0x02, 0x00, 0x4c, 0x4f, 0x4f, 0x50 }; unsigned char kVista_WLA_MAC[6] = { 0x7F, 0x00, 0x00, 0x01, 0x4f, 0x50 }; + #ifdef USE_VMWARE unsigned char kVMWare_MAC[5] = { 0x00, 0x50, 0x56, 0xC0, 0x00 }; + #endif int status; HKEY hkConfig; LONG rv; *************** *** 491,498 **** return FALSE; } return (memcmp(astat.status.adapter_address, kWLA_MAC, 6) == 0 || ! memcmp(astat.status.adapter_address, kVista_WLA_MAC, 6) == 0 || ! memcmp(astat.status.adapter_address, kVMWare_MAC, 5) == 0); } // Get the netbios named used/to-be-used by the AFS SMB server. --- 493,503 ---- return FALSE; } return (memcmp(astat.status.adapter_address, kWLA_MAC, 6) == 0 || ! memcmp(astat.status.adapter_address, kVista_WLA_MAC, 6) == 0 ! #ifdef USE_VMWARE ! || memcmp(astat.status.adapter_address, kVMWare_MAC, 5) == 0 ! #endif ! ); } // Get the netbios named used/to-be-used by the AFS SMB server. Index: openafs/src/WINNT/afsd/smb.c diff -c openafs/src/WINNT/afsd/smb.c:1.118.2.33 openafs/src/WINNT/afsd/smb.c:1.118.2.37 *** openafs/src/WINNT/afsd/smb.c:1.118.2.33 Wed Mar 7 13:14:05 2007 --- openafs/src/WINNT/afsd/smb.c Thu Jul 5 15:22:16 2007 *************** *** 1798,1803 **** --- 1798,1833 ---- return 0; } + /* Check for volume references + + They look like {%,#} + */ + if (strchr(shareName, '%') != NULL || + strchr(shareName, '#') != NULL) { + char pathstr[CELL_MAXNAMELEN + VL_MAXNAMELEN + 1 + CM_PREFIX_VOL_CCH]; + /* make room for '/@vol:' + mountchar + NULL terminator*/ + + osi_Log1(smb_logp, "smb_FindShare found volume reference [%s]", + osi_LogSaveString(smb_logp, shareName)); + + snprintf(pathstr, sizeof(pathstr)/sizeof(char), + "/" CM_PREFIX_VOL "%s", shareName); + pathstr[sizeof(pathstr)/sizeof(char) - 1] = '\0'; + len = strlen(pathstr) + 1; + + *pathNamep = malloc(len); + if (*pathNamep) { + strcpy(*pathNamep, pathstr); + strlwr(*pathNamep); + osi_Log1(smb_logp, " returning pathname [%s]", + osi_LogSaveString(smb_logp, *pathNamep)); + + return 1; + } else { + return 0; + } + } + #ifndef DJGPP code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts", 0, KEY_QUERY_VALUE, &parmKey); *************** *** 4487,4492 **** --- 4517,4523 ---- "has filetype %d", osi_LogSaveString(smb_logp, dep->name), fileType); if (fileType == CM_SCACHETYPE_DIRECTORY || + fileType == CM_SCACHETYPE_MOUNTPOINT || fileType == CM_SCACHETYPE_DFSLINK || fileType == CM_SCACHETYPE_INVALID) osi_Log0(smb_logp, "SMB search dir skipping directory or bad link"); *************** *** 6715,6721 **** offset = LargeIntegerAdd(offset, ConvertLongToLargeInteger(written)); ! count -= written; total_written += written; written = 0; } --- 6746,6752 ---- offset = LargeIntegerAdd(offset, ConvertLongToLargeInteger(written)); ! count -= (unsigned short)written; total_written += written; written = 0; } *************** *** 8342,8347 **** --- 8373,8383 ---- } if (lanaRemaining == 0) { + cm_VolStatus_Network_Stopped(cm_NetbiosName + #ifdef _WIN64 + ,cm_NetbiosName + #endif + ); smb_ListenerState = SMB_LISTENER_STOPPED; smb_LANadapter = -1; lana_list.length = 0; *************** *** 8771,8776 **** --- 8807,8817 ---- lana_list.length = 0; smb_LANadapter = -1; smb_ListenerState = SMB_LISTENER_STOPPED; + cm_VolStatus_Network_Stopped(cm_NetbiosName + #ifdef _WIN64 + ,cm_NetbiosName + #endif + ); } /* we're done with the NCB now */ *************** *** 8789,8794 **** --- 8830,8840 ---- return; smb_ListenerState = SMB_LISTENER_STARTED; + cm_VolStatus_Network_Started(cm_NetbiosName + #ifdef _WIN64 + , cm_NetbiosName + #endif + ); for (i = 0; i < lana_list.length; i++) { if (lana_list.lana[i] == 255) *************** *** 8845,8850 **** --- 8891,8901 ---- return; smb_ListenerState = SMB_LISTENER_STOPPED; + cm_VolStatus_Network_Stopped(cm_NetbiosName + #ifdef _WIN64 + , cm_NetbiosName + #endif + ); ncbp = GetNCB(); *************** *** 9564,9566 **** --- 9615,9622 ---- lock_ReleaseRead(&smb_rctLock); return 0; } + + long smb_IsNetworkStarted(void) + { + return (smb_ListenerState == SMB_LISTENER_STARTED && smbShutdownFlag == 0); + } Index: openafs/src/WINNT/afsd/smb.h diff -c openafs/src/WINNT/afsd/smb.h:1.41.2.15 openafs/src/WINNT/afsd/smb.h:1.41.2.16 *** openafs/src/WINNT/afsd/smb.h:1.41.2.15 Tue Apr 3 10:50:40 2007 --- openafs/src/WINNT/afsd/smb.h Thu Jul 5 15:22:16 2007 *************** *** 755,760 **** --- 755,761 ---- extern void smb_RestartListeners(void); extern void smb_StopListeners(void); extern void smb_StopListener(NCB *ncbp, int lana); + extern long smb_IsNetworkStarted(void); #define SMB_LISTENER_UNINITIALIZED -1 #define SMB_LISTENER_STOPPED 0 Index: openafs/src/WINNT/afsd/smb3.c diff -c openafs/src/WINNT/afsd/smb3.c:1.95.2.33 openafs/src/WINNT/afsd/smb3.c:1.95.2.38 *** openafs/src/WINNT/afsd/smb3.c:1.95.2.33 Wed May 16 11:55:16 2007 --- openafs/src/WINNT/afsd/smb3.c Sat Jun 30 00:38:52 2007 *************** *** 144,150 **** if(!(i%16)) { if(i) { osi_Log0(smb_logp, osi_LogSaveString(smb_logp, buf)); ! strcat(buf,"\n"); OutputDebugString(buf); } sprintf(buf,"%5x",i); --- 144,150 ---- if(!(i%16)) { if(i) { osi_Log0(smb_logp, osi_LogSaveString(smb_logp, buf)); ! strcat(buf,"\r\n"); OutputDebugString(buf); } sprintf(buf,"%5x",i); *************** *** 169,175 **** } if(i) { osi_Log0(smb_logp, osi_LogSaveString(smb_logp, buf)); ! strcat(buf,"\n"); OutputDebugString(buf); } } --- 169,175 ---- } if(i) { osi_Log0(smb_logp, osi_LogSaveString(smb_logp, buf)); ! strcat(buf,"\r\n"); OutputDebugString(buf); } } *************** *** 3719,3725 **** *((u_long *)dptr) = SMB_ATTR_DIRECTORY; break; default: ! *((u_long *)dptr) = SMB_ATTR_NORMAL; } /* merge in hidden attribute */ --- 3719,3735 ---- *((u_long *)dptr) = SMB_ATTR_DIRECTORY; break; default: ! /* if we get here we either have a normal file ! * or we have a file for which we have never ! * received status info. In this case, we can ! * check the even/odd value of the entry's vnode. ! * even means it is to be treated as a directory ! * and odd means it is to be treated as a file. ! */ ! if (mustFake && (scp->fid.vnode & 0x1)) ! *((u_long *)dptr) = SMB_ATTR_DIRECTORY; ! else ! *((u_long *)dptr) = SMB_ATTR_NORMAL; } /* merge in hidden attribute */ *************** *** 4447,4452 **** --- 4457,4463 ---- if (!(attribute & SMB_ATTR_DIRECTORY) && (targetscp->fileType == CM_SCACHETYPE_DIRECTORY || + targetscp->fileType == CM_SCACHETYPE_MOUNTPOINT || targetscp->fileType == CM_SCACHETYPE_DFSLINK || targetscp->fileType == CM_SCACHETYPE_INVALID)) { *************** *** 5107,5112 **** --- 5118,5124 ---- "has filetype %d", dep->name, fileType);*/ if (fileType == CM_SCACHETYPE_DIRECTORY || + fileType == CM_SCACHETYPE_MOUNTPOINT || fileType == CM_SCACHETYPE_DFSLINK || fileType == CM_SCACHETYPE_INVALID) osi_Log0(smb_logp, "T2 search dir skipping directory or bad link"); *************** *** 6177,6182 **** --- 6189,6195 ---- cm_key_t key; LARGE_INTEGER LOffset; LARGE_INTEGER LLength; + cm_scache_t * scp; pid = ((smb_t *) inp)->pid; key = cm_GenerateKey(vcp->vcID, pid, fd); *************** *** 6186,6194 **** LLength.HighPart = 0; LLength.LowPart = count; ! lock_ObtainMutex(&fidp->scp->mx); ! code = cm_LockCheckWrite(fidp->scp, LOffset, LLength, key); ! lock_ReleaseMutex(&fidp->scp->mx); if (code) goto done; --- 6199,6208 ---- LLength.HighPart = 0; LLength.LowPart = count; ! scp = fidp->scp; ! lock_ObtainMutex(&scp->mx); ! code = cm_LockCheckWrite(scp, LOffset, LLength, key); ! lock_ReleaseMutex(&scp->mx); if (code) goto done; *************** *** 6297,6311 **** key = cm_GenerateKey(vcp->vcID, pid, fd); { LARGE_INTEGER LOffset, LLength; LOffset.HighPart = offset.HighPart; LOffset.LowPart = offset.LowPart; LLength.HighPart = 0; LLength.LowPart = count; ! lock_ObtainMutex(&fidp->scp->mx); ! code = cm_LockCheckRead(fidp->scp, LOffset, LLength, key); ! lock_ReleaseMutex(&fidp->scp->mx); } if (code) { --- 6311,6327 ---- key = cm_GenerateKey(vcp->vcID, pid, fd); { LARGE_INTEGER LOffset, LLength; + cm_scache_t *scp; LOffset.HighPart = offset.HighPart; LOffset.LowPart = offset.LowPart; LLength.HighPart = 0; LLength.LowPart = count; ! scp = fidp->scp; ! lock_ObtainMutex(&scp->mx); ! code = cm_LockCheckRead(scp, LOffset, LLength, key); ! lock_ReleaseMutex(&scp->mx); } if (code) { Index: openafs/src/WINNT/afsd/smb_ioctl.c diff -c openafs/src/WINNT/afsd/smb_ioctl.c:1.25.2.4 openafs/src/WINNT/afsd/smb_ioctl.c:1.25.2.5 *** openafs/src/WINNT/afsd/smb_ioctl.c:1.25.2.4 Sat Apr 14 14:49:36 2007 --- openafs/src/WINNT/afsd/smb_ioctl.c Sun Jun 10 13:00:07 2007 *************** *** 115,121 **** * this is the first read call. This is the function that actually makes the * call to the ioctl code. */ ! smb_IoctlPrepareRead(smb_fid_t *fidp, smb_ioctl_t *ioctlp, cm_user_t *userp) { long opcode; smb_ioctlProc_t *procp = NULL; --- 115,121 ---- * this is the first read call. This is the function that actually makes the * call to the ioctl code. */ ! long smb_IoctlPrepareRead(smb_fid_t *fidp, smb_ioctl_t *ioctlp, cm_user_t *userp) { long opcode; smb_ioctlProc_t *procp = NULL; Index: openafs/src/WINNT/afsd/smb_ioctl.h diff -c openafs/src/WINNT/afsd/smb_ioctl.h:1.4.14.2 openafs/src/WINNT/afsd/smb_ioctl.h:1.4.14.3 *** openafs/src/WINNT/afsd/smb_ioctl.h:1.4.14.2 Mon Dec 11 23:01:26 2006 --- openafs/src/WINNT/afsd/smb_ioctl.h Sun Jun 10 13:00:07 2007 *************** *** 42,45 **** --- 42,47 ---- smb_packet_t *outp, dos_ptr rawBuf); #endif /* !DJGPP */ + extern long smb_IoctlPrepareRead(smb_fid_t *fidp, smb_ioctl_t *ioctlp, cm_user_t *userp); + #endif /* __SMB_IOCTL_H_ENV__ */ Index: openafs/src/WINNT/afsd/symlink.c diff -c openafs/src/WINNT/afsd/symlink.c:1.8.4.1 openafs/src/WINNT/afsd/symlink.c:1.8.4.2 *** openafs/src/WINNT/afsd/symlink.c:1.8.4.1 Tue Apr 10 14:39:48 2007 --- openafs/src/WINNT/afsd/symlink.c Mon Jul 2 20:35:13 2007 *************** *** 88,94 **** code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1); if (code == 0) ! return !strcmp("Freelance.Local.Root",space); return 1; /* assume it is because it is more restrictive that way */ } --- 88,94 ---- code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1); if (code == 0) ! return !stricmp("Freelance.Local.Root",space); return 1; /* assume it is because it is more restrictive that way */ } Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.14 openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.16 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.14 Wed May 16 18:37:08 2007 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm Fri Jun 22 10:40:12 2007 *************** *** 1,213 **** ! - ! OpenAFS for Windows Documentation - - - - - !
!

OpenAFS for Windows

!

Version 1.5.20

!

 

Welcome to the OpenAFS for Windows online documentation set!

The documentation set includes the OpenAFS for Windows Release Notes and the IBM AFS for Windows 3.6 product notes and installation and configuration ! information for the AFS Server, AFS ! Control Center, AFS Client, and AFS Light products. The OpenAFS for Windows online documentation set also includes the following administrative documentation: the IBM AFS Administration Reference and the IBM AFS Administration Guide. --- 1,71 ---- ! ! OpenAFS for Windows Documentation !

!

! ! !

OpenAFS for Windows

!

Version 1.5.21

!

 

Welcome to the OpenAFS for Windows online documentation set!

The documentation set includes the OpenAFS for Windows Release Notes and the IBM AFS for Windows 3.6 product notes and installation and configuration ! information for the AFS Server, AFS Control Center, AFS Client, and AFS Light products. The OpenAFS for Windows online documentation set also includes the following administrative documentation: the IBM AFS Administration Reference and the IBM AFS Administration Guide. *************** *** 218,262 ****

Online Documentation:

!

·         ! OpenAFS for Windows 1.5.11 Release Notes

!

·         ! IBM AFS for Windows 3.6 Quick Beginnings

!

·         ! IBM AFS for Windows 3.6 Release Notes

!

·         ! IBM AFS 3.6 Administration Guide

!

·         ! IBM AFS 3.6 Administration Reference

!

 
!
!

--- 76,115 ----

Online Documentation:

!

! ·         ! OpenAFS for Windows 1.5.21 Release Notes

!

! ·         ! IBM AFS for Windows 3.6 Quick Beginnings

!

! ·         ! IBM AFS for Windows 3.6 Release Notes

!

! ·         ! IBM AFS 3.6 Administration Guide

!

! ·         ! IBM AFS 3.6 Administration Reference

!

 
!
!

Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.15 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.16 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.15 Wed May 16 18:37:13 2007 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm Fri Jun 22 10:18:39 2007 *************** *** 18,24 **** .shape {behavior:url(#default#VML);} ! OpenAFS for Windows 1.5.20 Release Notes ! OpenAFS for Windows 1.5.21 Release Notes ! OpenAFS for Windows 1.5.20 Release Notes ! OpenAFS for Windows 1.5.21 Release Notes Jeffrey Altman ! 2 ! 744 2006-11-29T17:26:00Z ! 2006-12-18T23:20:00Z ! 1 ! 16067 ! 91587 Secure Endpoints Inc. ! 763 ! 214 ! 107440 11.8132  

--- 250,1454 ----

1. Installer Options

2. System Requirements

2.1 Supported Operating Systems

2.1.1 Unsupported Operating Systems

2.2 Disk Space

2.3 Additional Software Packages

3. Operational Notes

3.1. Requirements for Kerberos v5 ! Authentication

3.1.1. Active Directory

3.1.2. Using the krb524 service

3.1.3. Network Identity Manager Provider

3.2. Use of the Microsoft Loopback Adapter by ! the AFS Client Service

3.3. Using Freelance (Dynamic Root) Mode to ! Improve Mobility

3.4. Locating AFS Volume Database Servers via ! DNS

3.5. Obtaining AFS Tokens as a Integrated ! Part of Windows Logon

3.6. AFS System Tray Command Line Options

3.7. The “AFS Client Admins” Authorization ! Group

3.8. OpenAFS support for UNC paths

3.9. aklog.exe

3.10. OpenAFS Servers on Windows are ! Unsupported

3.10.1. OpenAFS Server Installation

3.10.2. Using the AFS Client Service when the ! Server is installed

3.11. OpenAFS Debugging Symbol files

3.12. Large Files (64-bit) Supported

3.13. Encrypted AFS Network Communication

3.14. Authenticated Access to the OpenAFS ! Client Service

3.15. No More INI Files

3.16. Microsoft Windows Internet Connection ! Firewall

3.17. Browsing AFS from the Explorer Shell ! and Office

3.18. Byte Range Locking

3.19. Automatic Discarding of AFS Tokens at ! Logoff

3.20. Windows Terminal Server installations

3.21. Hidden Dot Files

3.22. Status Cache Limits

3.23. NETBIOS over TCP/IP must be enabled

3.24. OpenAFS binaries are digitally signed

3.25. Maximum Size of the AFSCache File

3.26. Filename Character Sets

3.27. Known Character Set Issues with Roaming ! Profiles

3.28. The AFSCache File

3.29. Restricting OpenAFS Client Service ! Start and Stop

3.30. The @sys Name List

3.31. Symlinks to AFS UNC paths

3.32. Cache Manager Debugging Now Supported

3.33. Windows Logon Caching vs. Kerberos ! Logons

3.34. Initial Server Preferences

3.35. File Timestamps

3.36. Windows RPC client support must be ! installed

3.37. Generating Minidumps of the OpenAFS ! Client Service

3.38. AFS Client Universally Unique ! Identifiers

3.39. Delayed Write Errors with Microsoft ! Office Applications

3.40. Global Drives (aka Service Drive Letters) are no longer supported by Microsoft

3.41. 64-bit Microsoft Windows Installations

3.42. Known Issues with Microsoft Windows ! Vista

! !

3.43. New AFS Share Name Syntax Provides ! Direct Access to Volumes

! !

3.44. Differences between Windows and UNIX ! “fs examine”

4. How to Debug Problems with OpenAFS for ! Windows:

4.1. pioctl debugging (IoctlDebug registry ! key)

4.2. afsd_service initialization log ! (%WinDir%\TEMP\afsd_init.log)

4.3. afsd_service debug logs (fs trace {-on, -off, -dump} ->%WinDir%\TEMP\afsd.log)

4.4. Using SysInternal’s DbgView and ProcMon ! or FileMon Tools

4.5. Microsoft MiniDumps  (fs minidump -> %WinDir%\TEMP\afsd.dmp)

4.6. Single Sign-on (Integrated Logon) ! debugging

4.7. RX (AFS RPC) debugging (rxdebug)

4.8. Cache Manager debugging (cmdebug)

4.9. Persistent Cache consistency check

5. Reporting Bugs:

6. How to Contribute to the Development of ! OpenAFS for Windows

6.1. The USENIX OpenAFS Fund

6.2. Secure Endpoints Inc.

6.3. Direct contributions of code and/or ! documentation

6.4. OpenAFS for Windows Mailing Lists

7. MSI Deployment Guide

7.1. Introduction

7.1.1 Requirements

7.1.2 Authoring a Transform

7.2. Configuration Options

7.2.1 Configurable Properties

7.2.1.1 Setting Properties

7.2.1.2 OpenAFS for Windows Properties

(Service parameters):

(Network provider):

(OpenAFS Client):

7.2.1.2.1 Registry Properties

AFSCACHEPATH

AFSCACHESIZE

AFSCELLNAME

FREELANCEMODE

HIDEDOTFILES

LOGONOPTIONS

MOUNTROOT

NETBIOSNAME

NOFINDLANABYNAME

RXMAXMTU

SECURITYLEVEL

SMBAUTHTYPE

STOREANSIFILENAMES

USEDNS

7.2.1.2.2 AFSCreds.exe Properties

CREDSSTARTUP

CREDSAUTOINIT

CREDSIPCHDET

CREDSQUIET

CREDSRENEWDRMAP

CREDSSHOW

7.2.2 Existing Registry Entries

7.2.3 Replacing Configuration Files

7.2.3.1 Components for Configuration Files

7.2.4 Adding Domain Specific Registry Keys

7.2.5 Adding Site Specific Freelance Registry ! Keys

7.3 Additional Resources

7.4. Upgrades

Appendix A: Registry Values

A.1. Service parameters

Regkey: [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

Value: LANadapter

Value: CacheSize

Value: ChunkSize

Value: Daemons

Value: ServerThreads

Value: Stats

Value: LogoffPreserveTokens

Value: RootVolume

Value: MountRoot

Value: CachePath

Value: NonPersistentCaching

Value: ValidateCache

Value: TrapOnPanic

Value: NetbiosName

Value: IsGateway

Value: ReportSessionStartups

Value: TraceBufferSize

Value: SysName

Value: SecurityLevel

Value: UseDNS

Value: FreelanceClient

Value: HideDotFiles

Value: MaxMpxRequests

Value: MaxVCPerServer

Value: Cell

Value: RxNoJumbo

Value: RxMaxMTU

Value: ConnDeadTimeout

Value: HardDeadTimeout

Value: TraceOption

Value: AllSubmount

Value: NoFindLanaByName

Value: MaxCPUs

Value: smbAuthType

Value: MaxLogSize

Value: FlushOnHibernate

Value: daemonCheckDownInterval

Value: daemonCheckUpInterval

Value: daemonCheckVolInterval

Value: daemonCheckCBInterval

Value: daemonCheckLockInterval

Value: daemonCheckTokenInterval

Value: daemonCheckOfflineVolInterval

Value: CallBackPort

! !

Value: EnableServerLocks

Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters\GlobalAutoMapper]

Value: <Drive Letter:> for example ! "G:"

Regkey: [HKLM\SOFTWARE\OpenAFS\Client]

Value: CellServDBDir

Value: VerifyServiceSignature

Value: IoctlDebug

Value: MiniDumpType

Value: StoreAnsiFilenames

Regkey: [HKLM\SOFTWARE\OpenAFS\Client\CSCPolicy]

Value: "smb/cifs share name"

Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Freelance]

Value: "numeric value"

Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Freelance\Symlinks]

Value: "numeric value"

Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Submounts]

Value: "submount name"

Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Server ! Preferences\VLDB]

Value: "hostname or ip address"

Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Server ! Preferences\File]

Value: "hostname or ip address"

A.2. Integrated Logon Network provider ! parameters

Regkey: [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

Value: FailLoginsSilently

Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

Value: NoWarnings

Value: AuthentProviderPath

Value: Class

Value: DependOnGroup

Value: DependOnService

Value: Name

Value: ProviderPath

A.2.1 Domain specific configuration keys for ! the Network Provider

[HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

[HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain]

[HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain"domain ! name"]

[HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

Example:

A.2.1.1 Domain specific configuration values

[HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain"domain name"] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

Value: LogonOptions

Value: FailLoginsSilentl

Value: LogonScript

Value: LoginRetryInterval

Value: LoginSleepInterval

Value: TheseCells

A.2.1.2 Selection of effective values for ! domain specific configuration

A.2.1.3 Exceptions to A.2.1.2

2.1.3.1 'FailLoginsSilently'

2.1.3.2 'LogonScript'

A.3. AFS Credentials System Tray Tool ! parameters

Regkey: [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

Value: Gateway

Value: Cell

Regkey: [HKLM\SOFTWARE\OpenAFS\Client] ! [HKCU\SOFTWARE\OpenAFS\Client]

Value: ShowTrayIcon

Value: EnableKFW

Value: Use524

Value: AfscredsShortcutParams

Regkey: [HKCU\SOFTWARE\OpenAFS\Client]

Value: Authentication Cell

Regkey: [HKCU\SOFTWARE\OpenAFS\Client\Reminders]

Value: "afs cell name"

Regkey: [HKCU\SOFTWARE\OpenAFS\Client\Active ! Maps]

Value: "upper case drive letter"

Regkey: [HKCU\SOFTWARE\OpenAFS\Client\Mappings]

Value: "upper case drive letter"

A.4 ! OpenAFS Client Service Environment Variables

Variable: AFS_RPC_ENCRYPT

Variable: AFS_RPC_PROTSEQ

 

Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/cachmgr.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/fserver1.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/fserver2.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/overview.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/scout1.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/scout2.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/scout3.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/scout4.gif Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/SysAdminGd/vnode.gif Index: openafs/src/WINNT/install/NSIS/CellServDB diff -c openafs/src/WINNT/install/NSIS/CellServDB:1.6.4.2 openafs/src/WINNT/install/NSIS/CellServDB:1.6.4.3 *** openafs/src/WINNT/install/NSIS/CellServDB:1.6.4.2 Fri Mar 9 23:55:08 2007 --- openafs/src/WINNT/install/NSIS/CellServDB Thu Jul 5 19:47:40 2007 *************** *** 1,4 **** ! >grand.central.org #GCO Public CellServDB 09 Mar 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se --- 1,4 ---- ! >grand.central.org #GCO Public CellServDB 05 Jul 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se *************** *** 18,23 **** --- 18,26 ---- 129.27.161.7 #faepafs1.tu-graz.ac.at 129.27.161.15 #faepafs2.tu-graz.ac.at 129.27.161.114 #faepafs3.tu-graz.ac.at + >sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi + 132.216.24.122 #germain.sums.math.mcgill.ca + 132.216.24.125 #turing.sums.math.mcgill.ca >cern.ch #European Laboratory for Particle Physics, Geneva 137.138.128.148 #afsdb1.cern.ch 137.138.246.50 #afsdb3.cern.ch *************** *** 110,115 **** --- 113,120 ---- 141.35.2.180 #afs00.rz.uni-jena.de 141.35.2.181 #afs01.rz.uni-jena.de 141.35.2.182 #afs02.rz.uni-jena.de + >impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst. + 134.95.80.39 #forano.meteo.uni-koeln.de >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology 134.95.144.22 #afs1.meteo.uni-koeln.de 134.95.144.24 #afs2.meteo.uni-koeln.de *************** *** 161,183 **** 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.194.178 #cherry.srv.cs.cmu.edu ! 128.2.194.179 #pumpkin.srv.cs.cmu.edu ! 128.2.194.180 #strawberry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar Campus Cell ! 204.194.25.7 #afs1.qatar.cmu.edu ! 204.194.25.8 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #Cornell Nanoscale Science and Technology Facility 128.253.198.9 #hole.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu --- 166,189 ---- 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.201.46 #strawberry.srv.cs.cmu.edu ! 128.2.201.47 #pumpkin.srv.cs.cmu.edu ! 128.2.201.48 #cherry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar ! 86.36.46.6 #afs1.qatar.cmu.edu ! 86.36.46.7 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #CNF 128.253.198.9 #hole.cnf.cornell.edu + 128.253.198.27 #smoke.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu *************** *** 285,290 **** --- 291,300 ---- 128.174.251.8 #alnitak.acm.uiuc.edu 128.174.251.9 #alnilam.acm.uiuc.edu 128.174.251.10 #mintaka.acm.uiuc.edu + >illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory + 128.174.193.200 #ial.illigal.uiuc.edu + 128.174.193.201 #cac.illigal.uiuc.edu + 128.174.193.202 #gcs.illigal.uiuc.edu >ncsa.uiuc.edu #University of Illinois 141.142.3.5 #congo.ncsa.uiuc.edu 141.142.3.8 #nile.ncsa.uiuc.edu *************** *** 478,486 **** >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 209.234.76.70 #service-3.tproa.net ! 209.234.76.75 #service-4.tproa.net ! 209.234.76.76 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl --- 488,496 ---- >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 72.13.4.23 #service-3.tproa.net ! 72.13.4.24 #service-4.tproa.net ! 72.13.4.25 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl *************** *** 519,526 **** 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se - 130.237.209.39 #ezri.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se --- 529,536 ---- 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se + 130.237.209.5 #afsdb2.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se *************** *** 546,552 **** >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.237.230 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University --- 556,562 ---- >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.234.101 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University Index: openafs/src/WINNT/install/NSIS/OpenAFS.nsi diff -c openafs/src/WINNT/install/NSIS/OpenAFS.nsi:1.88.4.9 openafs/src/WINNT/install/NSIS/OpenAFS.nsi:1.88.4.10 *** openafs/src/WINNT/install/NSIS/OpenAFS.nsi:1.88.4.9 Wed Mar 28 18:30:46 2007 --- openafs/src/WINNT/install/NSIS/OpenAFS.nsi Fri Jun 22 10:43:15 2007 *************** *** 1664,1669 **** --- 1664,1670 ---- Delete "$INSTDIR\Documentation\html\InstallGd\*" Delete "$INSTDIR\Documentation\html\ReleaseNotes\*" Delete "$INSTDIR\Documentation\html\ReleaseNotes\logo_files\*" + Delete "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files\*" Delete "$INSTDIR\Documentation\html\SysAdminGd\*" Delete /REBOOTOK "$INSTDIR\Common\afs_config.exe" *************** *** 2881,2886 **** --- 2882,2889 ---- File "..\..\doc\install\Documentation\en_US\html\ReleaseNotes\*" SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" File "..\..\doc\install\Documentation\en_US\html\ReleaseNotes\logo_files\*" + SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + File "..\..\doc\install\Documentation\en_US\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1033.dll" "$INSTDIR\Client\Program\afscreds_1033.dll" "$INSTDIR" *************** *** 2940,2945 **** --- 2943,2950 ---- ;File "..\..\doc\install\Documentation\de_DE\html\ReleaseNotes\*" ;SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" ;File "..\..\doc\install\Documentation\de_DE\html\ReleaseNotes\logo_files\*" + ;SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + ;File "..\..\doc\install\Documentation\de_DE\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1032.dll" "$INSTDIR\Client\Program\afscreds_1032.dll" "$INSTDIR" *************** *** 2999,3004 **** --- 3004,3011 ---- ;File "..\..\doc\install\Documentation\es_ES\html\ReleaseNotes\*" SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" ;File "..\..\doc\install\Documentation\es_ES\html\ReleaseNotes\logo_files\*" + SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + ;File "..\..\doc\install\Documentation\es_ES\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1034.dll" "$INSTDIR\Client\Program\afscreds_1034.dll" "$INSTDIR" *************** *** 3058,3063 **** --- 3065,3072 ---- ;File "..\..\doc\install\Documentation\ja_JP\html\ReleaseNotes\*" SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" ;File "..\..\doc\install\Documentation\ja_JP\html\ReleaseNotes\logo_files\*" + SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + ;File "..\..\doc\install\Documentation\ja_JP\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1041.dll" "$INSTDIR\Client\Program\afscreds_1041.dll" "$INSTDIR" *************** *** 3117,3122 **** --- 3126,3133 ---- File "..\..\doc\install\Documentation\ko_KR\html\ReleaseNotes\*" SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" ;File "..\..\doc\install\Documentation\ko_KR\html\ReleaseNotes\logo_files\*" + SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + ;File "..\..\doc\install\Documentation\ko_KR\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1042.dll" "$INSTDIR\Client\Program\afscreds_1042.dll" "$INSTDIR" *************** *** 3177,3182 **** --- 3188,3195 ---- File "..\..\doc\install\Documentation\pt_BR\html\ReleaseNotes\*" SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" ;File "..\..\doc\install\Documentation\pt_BR\html\ReleaseNotes\logo_files\*" + SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + ;File "..\..\doc\install\Documentation\pt_BR\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1046.dll" "$INSTDIR\Client\Program\afscreds_1046.dll" "$INSTDIR" *************** *** 3236,3241 **** --- 3249,3256 ---- File "..\..\doc\install\Documentation\zh_CN\html\ReleaseNotes\*" SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" ;File "..\..\doc\install\Documentation\zh_CN\html\ReleaseNotes\logo_files\*" + SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + ;File "..\..\doc\install\Documentation\zh_CN\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_2052.dll" "$INSTDIR\Client\Program\afscreds_2052.dll" "$INSTDIR" *************** *** 3295,3300 **** --- 3310,3317 ---- File "..\..\doc\install\Documentation\zh_TW\html\ReleaseNotes\*" SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\logo_files" ;File "..\..\doc\install\Documentation\zh_TW\html\ReleaseNotes\logo_files\*" + SetOutPath "$INSTDIR\Documentation\html\ReleaseNotes\relnotes_files" + ;File "..\..\doc\install\Documentation\zh_TW\html\ReleaseNotes\relnotes_files\*" SetOutPath "$INSTDIR\Client\Program" !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1028.dll" "$INSTDIR\Client\Program\_1028.dll" "$INSTDIR" Index: openafs/src/WINNT/install/wix/CellServDB diff -c openafs/src/WINNT/install/wix/CellServDB:1.6.4.2 openafs/src/WINNT/install/wix/CellServDB:1.6.4.3 *** openafs/src/WINNT/install/wix/CellServDB:1.6.4.2 Fri Mar 9 23:55:11 2007 --- openafs/src/WINNT/install/wix/CellServDB Thu Jul 5 19:47:44 2007 *************** *** 1,4 **** ! >grand.central.org #GCO Public CellServDB 09 Mar 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se --- 1,4 ---- ! >grand.central.org #GCO Public CellServDB 05 Jul 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se *************** *** 18,23 **** --- 18,26 ---- 129.27.161.7 #faepafs1.tu-graz.ac.at 129.27.161.15 #faepafs2.tu-graz.ac.at 129.27.161.114 #faepafs3.tu-graz.ac.at + >sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi + 132.216.24.122 #germain.sums.math.mcgill.ca + 132.216.24.125 #turing.sums.math.mcgill.ca >cern.ch #European Laboratory for Particle Physics, Geneva 137.138.128.148 #afsdb1.cern.ch 137.138.246.50 #afsdb3.cern.ch *************** *** 110,115 **** --- 113,120 ---- 141.35.2.180 #afs00.rz.uni-jena.de 141.35.2.181 #afs01.rz.uni-jena.de 141.35.2.182 #afs02.rz.uni-jena.de + >impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst. + 134.95.80.39 #forano.meteo.uni-koeln.de >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology 134.95.144.22 #afs1.meteo.uni-koeln.de 134.95.144.24 #afs2.meteo.uni-koeln.de *************** *** 161,183 **** 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.194.178 #cherry.srv.cs.cmu.edu ! 128.2.194.179 #pumpkin.srv.cs.cmu.edu ! 128.2.194.180 #strawberry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar Campus Cell ! 204.194.25.7 #afs1.qatar.cmu.edu ! 204.194.25.8 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #Cornell Nanoscale Science and Technology Facility 128.253.198.9 #hole.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu --- 166,189 ---- 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.201.46 #strawberry.srv.cs.cmu.edu ! 128.2.201.47 #pumpkin.srv.cs.cmu.edu ! 128.2.201.48 #cherry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar ! 86.36.46.6 #afs1.qatar.cmu.edu ! 86.36.46.7 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #CNF 128.253.198.9 #hole.cnf.cornell.edu + 128.253.198.27 #smoke.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu *************** *** 285,290 **** --- 291,300 ---- 128.174.251.8 #alnitak.acm.uiuc.edu 128.174.251.9 #alnilam.acm.uiuc.edu 128.174.251.10 #mintaka.acm.uiuc.edu + >illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory + 128.174.193.200 #ial.illigal.uiuc.edu + 128.174.193.201 #cac.illigal.uiuc.edu + 128.174.193.202 #gcs.illigal.uiuc.edu >ncsa.uiuc.edu #University of Illinois 141.142.3.5 #congo.ncsa.uiuc.edu 141.142.3.8 #nile.ncsa.uiuc.edu *************** *** 478,486 **** >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 209.234.76.70 #service-3.tproa.net ! 209.234.76.75 #service-4.tproa.net ! 209.234.76.76 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl --- 488,496 ---- >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 72.13.4.23 #service-3.tproa.net ! 72.13.4.24 #service-4.tproa.net ! 72.13.4.25 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl *************** *** 519,526 **** 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se - 130.237.209.39 #ezri.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se --- 529,536 ---- 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se + 130.237.209.5 #afsdb2.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se *************** *** 546,552 **** >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.237.230 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University --- 556,562 ---- >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.234.101 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University Index: openafs/src/WINNT/install/wix/feature.wxi diff -c openafs/src/WINNT/install/wix/feature.wxi:1.14.2.3 openafs/src/WINNT/install/wix/feature.wxi:1.14.2.4 *** openafs/src/WINNT/install/wix/feature.wxi:1.14.2.3 Thu Oct 12 17:19:42 2006 --- openafs/src/WINNT/install/wix/feature.wxi Fri Jun 22 18:23:02 2007 *************** *** 13,18 **** --- 13,19 ---- + Index: openafs/src/WINNT/install/wix/files.wxi diff -c openafs/src/WINNT/install/wix/files.wxi:1.22.2.12 openafs/src/WINNT/install/wix/files.wxi:1.22.2.13 *** openafs/src/WINNT/install/wix/files.wxi:1.22.2.12 Thu Apr 26 14:45:16 2007 --- openafs/src/WINNT/install/wix/files.wxi Fri Jun 22 18:23:02 2007 *************** *** 773,778 **** --- 773,793 ---- + + + + + + + + + + + + + + + Index: openafs/src/WINNT/license/main.cpp diff -c openafs/src/WINNT/license/main.cpp:1.3 openafs/src/WINNT/license/main.cpp:1.3.4.1 *** openafs/src/WINNT/license/main.cpp:1.3 Sat Nov 5 01:48:00 2005 --- openafs/src/WINNT/license/main.cpp Thu Jul 5 11:55:42 2007 *************** *** 36,49 **** size_t cchReq = cchIn * 2 + 1; if (pszOut && (cchOut < cchReq)) { ! GlobalFree ((HGLOBAL)pszOut); pszOut = NULL; cchOut = 0; } if (!pszOut) { ! pszOut = (LPTSTR)GlobalAlloc (GMEM_FIXED, cchReq); cchOut = cchReq; } --- 36,49 ---- size_t cchReq = cchIn * 2 + 1; if (pszOut && (cchOut < cchReq)) { ! free(pszOut); pszOut = NULL; cchOut = 0; } if (!pszOut) { ! pszOut = (LPTSTR)malloc(cchReq); cchOut = cchReq; } *************** *** 216,245 **** DWORD cbSource; if ((cbSource = GetFileSize (hFile, NULL)) != 0) { ! LPTSTR abSource = (LPTSTR)GlobalAlloc (GMEM_FIXED, cbSource + 5); DWORD dwRead; ! if (!ReadFile (hFile, abSource, cbSource, &dwRead, NULL)) { printf ("failed to read %s; error %lu\n", psz, GetLastError()); rc = FALSE; } else { ! abSource[ dwRead ] = 0; ! DWORD cbTarget = dwRead * 4; ! LPSTR abTarget = (LPSTR)GlobalAlloc (GMEM_FIXED, cbTarget); memset (abTarget, 0x00, cbTarget); BOOL fDefault = FALSE; ! WideCharToMultiByte (g::CodePage, 0, (LPCWSTR)abSource, dwRead, abTarget, cbTarget, TEXT(" "), &fDefault); rc = FormatFile (psz, abTarget); ! GlobalFree ((HGLOBAL)abTarget); } ! GlobalFree ((HGLOBAL)abSource); } CloseHandle (hFile); --- 216,245 ---- DWORD cbSource; if ((cbSource = GetFileSize (hFile, NULL)) != 0) { ! LPTSTR abSource = (LPTSTR)malloc(cbSource + 1); ! memset(abSource, 0x00, cbSource + 1); DWORD dwRead; ! if (!ReadFile (hFile, abSource, cbSource, &dwRead, NULL) || cbSource != dwRead) { printf ("failed to read %s; error %lu\n", psz, GetLastError()); rc = FALSE; } else { ! DWORD cbTarget = cbSource * 4; ! LPSTR abTarget = (LPSTR)malloc(cbTarget); memset (abTarget, 0x00, cbTarget); BOOL fDefault = FALSE; ! WideCharToMultiByte (g::CodePage, 0, (LPCWSTR)abSource, cbSource, abTarget, cbTarget, TEXT(" "), &fDefault); rc = FormatFile (psz, abTarget); ! free(abTarget); } ! free(abSource); } CloseHandle (hFile); Index: openafs/src/WINNT/netidmgr_plugin/afsconfigdlg.c diff -c openafs/src/WINNT/netidmgr_plugin/afsconfigdlg.c:1.1.2.3 openafs/src/WINNT/netidmgr_plugin/afsconfigdlg.c:1.1.2.4 *** openafs/src/WINNT/netidmgr_plugin/afsconfigdlg.c:1.1.2.3 Mon Oct 16 09:55:34 2006 --- openafs/src/WINNT/netidmgr_plugin/afsconfigdlg.c Sun Jun 17 00:50:29 2007 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsconfigdlg.c,v 1.1.2.3 2006/10/16 13:55:34 jaltman Exp $ */ #include #include --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afsconfigdlg.c,v 1.1.2.4 2007/06/17 04:50:29 jaltman Exp $ */ #include #include *************** *** 85,91 **** d = (afs_ids_dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); ! PFREE(d); } return TRUE; --- 85,94 ---- d = (afs_ids_dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); ! if (d != NULL) { ! PFREE(d); ! SetWindowLongPtr(hwnd, DWLP_USER, 0); ! } } return TRUE; *************** *** 94,99 **** --- 97,105 ---- d = (afs_ids_dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return FALSE; + if (wParam == MAKEWPARAM(IDC_CFG_OBTAIN, BN_CLICKED)) { d->afs_enabled = (IsDlgButtonChecked(hwnd, IDC_CFG_OBTAIN) == *************** *** 110,115 **** --- 116,124 ---- d = (afs_ids_dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return FALSE; + if (HIWORD(wParam) == WMCFG_APPLY) { khm_int32 t; *************** *** 154,159 **** --- 163,173 ---- rv = afs_dlg_proc(hwnd, uMsg, wParam, 0); d = (afs_dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + #ifdef DEBUG + assert(d != NULL); + #endif + if (d == NULL) + return rv; d->cfg = *((khui_config_init_data *) lParam); *************** *** 187,193 **** #ifdef DEBUG assert(d && d->ident); #endif ! kcdb_identity_release(d->ident); return afs_dlg_proc(hwnd, uMsg, wParam, lParam); } --- 201,209 ---- #ifdef DEBUG assert(d && d->ident); #endif ! if (d && d->ident) { ! kcdb_identity_release(d->ident); ! } return afs_dlg_proc(hwnd, uMsg, wParam, lParam); } *************** *** 199,204 **** --- 215,223 ---- d = (afs_dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return TRUE; + if (HIWORD(wParam) == WMCFG_APPLY) { afs_cred_write_ident_data(d); } *************** *** 553,561 **** node = (khui_config_node) (DWORD_PTR) GetWindowLongPtr(hwnd, DWLP_USER); ! khui_cfg_set_flags(node, ! KHUI_CNFLAG_MODIFIED, ! KHUI_CNFLAG_MODIFIED); } break; } --- 572,582 ---- node = (khui_config_node) (DWORD_PTR) GetWindowLongPtr(hwnd, DWLP_USER); ! if (node != NULL) { ! khui_cfg_set_flags(node, ! KHUI_CNFLAG_MODIFIED, ! KHUI_CNFLAG_MODIFIED); ! } } break; } *************** *** 573,578 **** --- 594,605 ---- node = (khui_config_node) (DWORD_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + #ifdef DEBUG + assert(node != NULL); + #endif + if (node == NULL) + break; + kmm_get_plugin_config(AFS_PLUGIN_NAME, KHM_PERM_WRITE, &csp_afscred); Index: openafs/src/WINNT/netidmgr_plugin/afsfuncs.c diff -c openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.9 openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.10 *** openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.9 Sat May 5 17:14:48 2007 --- openafs/src/WINNT/netidmgr_plugin/afsfuncs.c Sun Jun 17 00:50:29 2007 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsfuncs.c,v 1.1.2.9 2007/05/05 21:14:48 jaltman Exp $ */ /* Disable the 'macro redefinition' warning which is getting triggerred by a redefinition of the ENCRYPT and DECRYPT macros. */ --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afsfuncs.c,v 1.1.2.10 2007/06/17 04:50:29 jaltman Exp $ */ /* Disable the 'macro redefinition' warning which is getting triggerred by a redefinition of the ENCRYPT and DECRYPT macros. */ *************** *** 521,527 **** &krb4_credtype_id); } ! if (krb4_credtype_id > 0 && KHM_SUCCEEDED(kcdb_credset_find_filtered(NULL, -1, afs_filter_krb4_tkt, (void *) cell, --- 521,527 ---- &krb4_credtype_id); } ! if (krb4_credtype_id >= 0 && KHM_SUCCEEDED(kcdb_credset_find_filtered(NULL, -1, afs_filter_krb4_tkt, (void *) cell, Index: openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c diff -c openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c:1.1.2.4 openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c:1.1.2.5 *** openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c:1.1.2.4 Sat May 5 17:14:48 2007 --- openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c Sun Jun 17 00:50:29 2007 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsnewcreds.c,v 1.1.2.4 2007/05/05 21:14:48 jaltman Exp $ */ #include #include --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afsnewcreds.c,v 1.1.2.5 2007/06/17 04:50:29 jaltman Exp $ */ #include #include *************** *** 377,382 **** --- 377,383 ---- khm_size cb; wchar_t vbuf[1024]; wchar_t * tbuf = NULL; + khm_int32 enabled = 0; kcdb_identity_create(t, 0, &h_id); if (h_id == NULL) { *************** *** 393,398 **** --- 394,403 ---- 0, &csp_afs))) goto _cleanup_loop; + if (KHM_SUCCEEDED(khc_read_int32(csp_afs, L"AFSEnabled", &enabled)) && + !enabled) + goto _cleanup_loop; + if (khc_read_multi_string(csp_afs, L"Cells", NULL, &cb) != KHM_ERROR_TOO_LONG) goto _cleanup_loop; *************** *** 472,477 **** --- 477,483 ---- khm_size cb; wchar_t vbuf[1024]; wchar_t * tbuf = NULL; + khm_int32 enabled = 0; kcdb_identity_create(t, 0, &h_id); if (h_id == NULL) { *************** *** 493,498 **** --- 499,508 ---- 0, &csp_afs))) goto _cleanup_loop; + if (KHM_SUCCEEDED(khc_read_int32(csp_afs, L"AFSEnabled", &enabled)) && + !enabled) + goto _cleanup_loop; + if (khc_read_multi_string(csp_afs, L"Cells", NULL, &cb) != KHM_ERROR_TOO_LONG) goto _cleanup_loop; *************** *** 603,610 **** StringCbCopy(r->cell, cb, s); r->realm = NULL; ! r->method = 0; ! r->flags = 0; if(KHM_SUCCEEDED(khc_open_space(h_cells, s, 0, &h_cell))) { --- 613,620 ---- StringCbCopy(r->cell, cb, s); r->realm = NULL; ! r->method = AFS_TOKEN_AUTO; ! r->flags = DLGROW_FLAG_CONFIG; if(KHM_SUCCEEDED(khc_open_space(h_cells, s, 0, &h_cell))) { *************** *** 852,857 **** --- 862,870 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return; + ZeroMemory(&ti, sizeof(ti)); ti.cbSize = sizeof(ti); ti.hwnd = hwnd; *************** *** 890,895 **** --- 903,911 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return; + if(!d->tooltip_visible) return; *************** *** 973,978 **** --- 989,997 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return; + if (d->nc) khui_cw_find_type(d->nc, afs_credtype_id, &nct); *************** *** 1059,1064 **** --- 1078,1086 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return; + if (d->nc) khui_cw_find_type(d->nc, afs_credtype_id, &nct); else *************** *** 1526,1531 **** --- 1548,1556 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return TRUE; + EnterCriticalSection(&d->cs); if (d->nc) { *************** *** 1540,1545 **** --- 1565,1572 ---- DeleteCriticalSection(&d->cs); PFREE(d); + + SetWindowLongPtr(hwnd, DWLP_USER, 0); } return TRUE; *************** *** 1551,1556 **** --- 1578,1586 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return FALSE; + EnterCriticalSection(&d->cs); if (d->nc) *************** *** 1605,1610 **** --- 1635,1643 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return TRUE; + EnterCriticalSection(&d->cs); if (d->nc) *************** *** 1885,1890 **** --- 1918,1926 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return FALSE; + EnterCriticalSection(&d->cs); hw = GetDlgItem(hwnd, IDC_NCAFS_TOKENLIST); *************** *** 1939,1944 **** --- 1975,1983 ---- d = (afs_dlg_data *)(LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d == NULL) + return FALSE; + EnterCriticalSection(&d->cs); pnmi = (LPNMITEMACTIVATE) lpnmh; *************** *** 2158,2170 **** lru_cell, &cbt); } else { ! cbcell = MAXCELLCHARS * sizeof(wchar_t) * ! l->n_rows; ! if (cbcell > 0) { lru_cell = PMALLOC(cbcell); ZeroMemory(lru_cell, cbcell); } else { lru_cell = NULL; } } --- 2197,2209 ---- lru_cell, &cbt); } else { ! cbcell = MAXCELLCHARS * sizeof(wchar_t) * l->n_rows + sizeof(wchar_t); ! if (l->n_rows > 0) { lru_cell = PMALLOC(cbcell); ZeroMemory(lru_cell, cbcell); } else { lru_cell = NULL; + cbcell = 0; } } *************** *** 2182,2202 **** lru_realm, &cbt); } else { ! cbrealm = MAXCELLCHARS * sizeof(wchar_t) * l->n_rows; ! if (cbrealm > 0) { lru_realm = PMALLOC(cbrealm); ZeroMemory(lru_realm, cbrealm); } else { lru_cell = NULL; } } ! cbidcell = MAXCELLCHARS * sizeof(wchar_t) * l->n_rows; ! if (cbidcell > 0) { id_cell = PMALLOC(cbidcell); ZeroMemory(id_cell, cbidcell); } else { id_cell = NULL; } for(i=0; i < l->n_rows; i++) --- 2221,2243 ---- lru_realm, &cbt); } else { ! cbrealm = MAXCELLCHARS * sizeof(wchar_t) * l->n_rows + sizeof(wchar_t); ! if (l->n_rows > 0) { lru_realm = PMALLOC(cbrealm); ZeroMemory(lru_realm, cbrealm); } else { lru_cell = NULL; + cbrealm = 0; } } ! cbidcell = MAXCELLCHARS * sizeof(wchar_t) * l->n_rows + sizeof(wchar_t); ! if (l->n_rows > 0) { id_cell = PMALLOC(cbidcell); ZeroMemory(id_cell, cbidcell); } else { id_cell = NULL; + cbidcell = 0; } for(i=0; i < l->n_rows; i++) *************** *** 2244,2253 **** khc_close_space(h_acell); } ! if (h_cellmap) { ! khc_write_string(h_cellmap, ! l->rows[i].cell, ! idname); } } --- 2285,2296 ---- khc_close_space(h_acell); } ! if (l->rows[i].flags & DLGROW_FLAG_DONE) { ! if (h_cellmap) { ! khc_write_string(h_cellmap, ! l->rows[i].cell, ! idname); ! } } } *************** *** 2260,2265 **** --- 2303,2310 ---- if (id_cell) khc_write_multi_string(h_afs, L"Cells", id_cell); + else + khc_write_multi_string(h_afs, L"Cells", L"\0"); if (d->config_dlg) { if (d->dirty) Index: openafs/src/WINNT/netidmgr_plugin/afsnewcreds.h diff -c openafs/src/WINNT/netidmgr_plugin/afsnewcreds.h:1.1.2.3 openafs/src/WINNT/netidmgr_plugin/afsnewcreds.h:1.1.2.4 *** openafs/src/WINNT/netidmgr_plugin/afsnewcreds.h:1.1.2.3 Mon Oct 16 09:55:35 2006 --- openafs/src/WINNT/netidmgr_plugin/afsnewcreds.h Sun Jun 17 00:50:29 2007 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsnewcreds.h,v 1.1.2.3 2006/10/16 13:55:35 jaltman Exp $ */ #ifndef __AFS_NEWCREDS_H #define __AFS_NEWCREDS_H --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afsnewcreds.h,v 1.1.2.4 2007/06/17 04:50:29 jaltman Exp $ */ #ifndef __AFS_NEWCREDS_H #define __AFS_NEWCREDS_H *************** *** 56,61 **** --- 56,65 ---- /* tokens for this cell exist and are expired */ #define DLGROW_FLAG_EXPIRED 0x00000040 + /* this cell was added because it was listed in the identity + configuration */ + #define DLGROW_FLAG_CONFIG 0x00000080 + /* the subitem indexes for each data field */ enum afs_ncwnd_subitems { NCAFS_IDX_CELL=0, Index: openafs/src/afs/afs_call.c diff -c openafs/src/afs/afs_call.c:1.86.4.8 openafs/src/afs/afs_call.c:1.86.4.11 *** openafs/src/afs/afs_call.c:1.86.4.8 Mon May 14 17:37:51 2007 --- openafs/src/afs/afs_call.c Mon Jun 18 14:18:48 2007 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_call.c,v 1.86.4.8 2007/05/14 21:37:51 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_call.c,v 1.86.4.11 2007/06/18 18:18:48 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 457,482 **** #endif /* AFS_SGI61_ENV */ AFS_STATCNT(afs_syscall_call); #ifdef AFS_SUN5_ENV ! if (!afs_suser(CRED()) && (parm != AFSOP_GETMTU) ! && (parm != AFSOP_GETMASK)) { ! /* only root can run this code */ ! return (EACCES); #else ! if (!afs_suser(NULL) && (parm != AFSOP_GETMTU) ! && (parm != AFSOP_GETMASK)) { /* only root can run this code */ #if defined(KERNEL_HAVE_UERROR) setuerror(EACCES); ! return (EACCES); #else ! #if defined(AFS_OSF_ENV) ! return EACCES; ! #else /* AFS_OSF_ENV */ ! return EPERM; ! #endif /* AFS_OSF_ENV */ #endif #endif } AFS_GLOCK(); #ifdef AFS_DARWIN80_ENV --- 457,483 ---- #endif /* AFS_SGI61_ENV */ AFS_STATCNT(afs_syscall_call); + if (!afs_suser( #ifdef AFS_SUN5_ENV ! CRED() #else ! NULL ! #endif ! ) && (parm != AFSOP_GETMTU) && (parm != AFSOP_GETMASK)) { /* only root can run this code */ + #if defined(AFS_OSF_ENV) || defined(AFS_SUN5_ENV) || defined(KERNEL_HAVE_UERROR) #if defined(KERNEL_HAVE_UERROR) setuerror(EACCES); ! #endif ! code = EACCES; #else ! code = EPERM; #endif + AFS_GLOCK(); + #ifdef AFS_DARWIN80_ENV + put_vfs_context(); #endif + goto out; } AFS_GLOCK(); #ifdef AFS_DARWIN80_ENV *************** *** 763,769 **** afs_osi_Sleep(&afs_initState); #ifdef AFS_DARWIN80_ENV ! get_vfs_context(); #endif /* do it by inode */ #ifdef AFS_SGI62_ENV --- 764,770 ---- afs_osi_Sleep(&afs_initState); #ifdef AFS_DARWIN80_ENV ! get_vfs_context(); #endif /* do it by inode */ #ifdef AFS_SGI62_ENV *************** *** 771,777 **** #endif code = afs_InitCacheFile(NULL, ainode); #ifdef AFS_DARWIN80_ENV ! put_vfs_context(); #endif } else if (parm == AFSOP_ROOTVOLUME) { /* wait for basic init */ --- 772,778 ---- #endif code = afs_InitCacheFile(NULL, ainode); #ifdef AFS_DARWIN80_ENV ! put_vfs_context(); #endif } else if (parm == AFSOP_ROOTVOLUME) { /* wait for basic init */ *************** *** 811,817 **** else if (parm == AFSOP_CELLINFO) code = afs_InitCellInfo(tbuffer); #ifdef AFS_DARWIN80_ENV ! put_vfs_context(); #endif } osi_FreeSmallSpace(tbuffer); --- 812,818 ---- else if (parm == AFSOP_CELLINFO) code = afs_InitCellInfo(tbuffer); #ifdef AFS_DARWIN80_ENV ! put_vfs_context(); #endif } osi_FreeSmallSpace(tbuffer); *************** *** 836,841 **** --- 837,843 ---- #if (!defined(AFS_NONFSTRANS)) || defined(AFS_AIX_IAUTH_ENV) afs_nfsclient_init(); #endif + afs_uuid_create(&afs_cb_interface.uuid); printf("found %d non-empty cache files (%d%%).\n", afs_stats_cmperf.cacheFilesReused, (100 * afs_stats_cmperf.cacheFilesReused) / *************** *** 844,849 **** --- 846,853 ---- } else if (parm == AFSOP_ADVISEADDR) { /* pass in the host address to the rx package */ int rxbind = 0; + int refresh = 0; + afs_int32 count = parm2; afs_int32 *buffer = afs_osi_Alloc(sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); *************** *** 853,858 **** --- 857,870 ---- afs_osi_Alloc(sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); int i; + /* This is a refresh */ + if (count & 0x40000000) { + count &= ~0x40000000; + /* Can't bind after we start. Fix? */ + count &= ~0x80000000; + refresh = 1; + } + /* Bind, but only if there's only one address configured */ if ( count & 0x80000000) { count &= ~0x80000000; *************** *** 892,907 **** afs_cb_interface.mtu[i] = (parm5 ? mtubuffer[i] : htonl(1500)); #endif } - afs_uuid_create(&afs_cb_interface.uuid); rxi_setaddr(buffer[0]); ! if (rxbind) ! rx_bindhost = buffer[0]; ! else ! rx_bindhost = htonl(INADDR_ANY); afs_osi_Free(buffer, sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); afs_osi_Free(maskbuffer, sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); afs_osi_Free(mtubuffer, sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); } #ifdef AFS_SGI53_ENV else if (parm == AFSOP_NFSSTATICADDR) { --- 904,925 ---- afs_cb_interface.mtu[i] = (parm5 ? mtubuffer[i] : htonl(1500)); #endif } rxi_setaddr(buffer[0]); ! if (!refresh) { ! if (rxbind) ! rx_bindhost = buffer[0]; ! else ! rx_bindhost = htonl(INADDR_ANY); ! } afs_osi_Free(buffer, sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); afs_osi_Free(maskbuffer, sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); afs_osi_Free(mtubuffer, sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); + + if (refresh) { + afs_CheckServers(1, NULL); /* check down servers */ + afs_CheckServers(0, NULL); /* check down servers */ + } } #ifdef AFS_SGI53_ENV else if (parm == AFSOP_NFSSTATICADDR) { *************** *** 1050,1058 **** code = EINVAL; out: - #ifdef AFS_DARWIN80_ENV /* to balance the put in afs3_syscall() */ - get_vfs_context(); - #endif AFS_GUNLOCK(); #ifdef AFS_LINUX20_ENV return -code; --- 1068,1073 ---- Index: openafs/src/afs/afs_memcache.c diff -c openafs/src/afs/afs_memcache.c:1.22 openafs/src/afs/afs_memcache.c:1.22.4.1 *** openafs/src/afs/afs_memcache.c:1.22 Thu Oct 13 11:12:07 2005 --- openafs/src/afs/afs_memcache.c Sat Jun 23 11:29:36 2007 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_memcache.c,v 1.22 2005/10/13 15:12:07 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifndef AFS_LINUX22_ENV --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_memcache.c,v 1.22.4.1 2007/06/23 15:29:36 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifndef AFS_LINUX22_ENV *************** *** 247,252 **** --- 247,259 ---- char *oldData = mceP->data; mceP->data = afs_osi_Alloc(size + offset); + if (mceP->data == NULL) { /* no available memory */ + mceP->data = oldData; /* revert back change that was made */ + MReleaseWriteLock(&mceP->afs_memLock); + afs_warn("afs: afs_MemWriteBlk mem alloc failure (%d bytes)\n", + size + offset); + return -ENOMEM; + } /* may overlap, but this is OK */ AFS_GUNLOCK(); *************** *** 285,290 **** --- 292,304 ---- char *oldData = mceP->data; mceP->data = afs_osi_Alloc(AFS_UIO_RESID(uioP) + AFS_UIO_OFFSET(uioP)); + if (mceP->data == NULL) { /* no available memory */ + mceP->data = oldData; /* revert back change that was made */ + MReleaseWriteLock(&mceP->afs_memLock); + afs_warn("afs: afs_MemWriteBlk mem alloc failure (%d bytes)\n", + AFS_UIO_RESID(uioP) + AFS_UIO_OFFSET(uioP)); + return -ENOMEM; + } AFS_GUNLOCK(); memcpy(mceP->data, oldData, mceP->size); *************** *** 314,322 **** MObtainWriteLock(&mceP->afs_memLock, 313); /* old directory entry; g.c. */ if (size == 0 && mceP->dataSize > memCacheBlkSize) { ! afs_osi_Free(mceP->data, mceP->dataSize); mceP->data = afs_osi_Alloc(memCacheBlkSize); ! mceP->dataSize = memCacheBlkSize; } if (size < mceP->size) --- 328,344 ---- MObtainWriteLock(&mceP->afs_memLock, 313); /* old directory entry; g.c. */ if (size == 0 && mceP->dataSize > memCacheBlkSize) { ! char *oldData = mceP->data; mceP->data = afs_osi_Alloc(memCacheBlkSize); ! if (mceP->data == NULL) { /* no available memory */ ! mceP->data = oldData; ! MReleaseWriteLock(&mceP->afs_memLock); ! afs_warn("afs: afs_MemWriteBlk mem alloc failure (%d bytes)\n", ! memCacheBlkSize); ! } else { ! afs_osi_Free(oldData, mceP->dataSize); ! mceP->dataSize = memCacheBlkSize; ! } } if (size < mceP->size) Index: openafs/src/afs/afs_pioctl.c diff -c openafs/src/afs/afs_pioctl.c:1.110.2.5 openafs/src/afs/afs_pioctl.c:1.110.2.7 *** openafs/src/afs/afs_pioctl.c:1.110.2.5 Mon Jul 31 17:33:28 2006 --- openafs/src/afs/afs_pioctl.c Sat Jun 23 02:23:12 2007 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.110.2.5 2006/07/31 21:33:28 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.110.2.7 2007/06/23 06:23:12 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV *************** *** 91,96 **** --- 91,97 ---- DECL_PIOCTL(PResidencyCmd); DECL_PIOCTL(PCallBackAddr); DECL_PIOCTL(PNFSNukeCreds); + DECL_PIOCTL(PNewUuid); /* * A macro that says whether we're going to need HandleClientContext(). *************** *** 193,198 **** --- 194,205 ---- PNewAlias, /* 1 -- create new cell alias */ PListAliases, /* 2 -- list cell aliases */ PCallBackAddr, /* 3 -- request addr for callback rxcon */ + PBogus, /* 4 */ + PBogus, /* 5 */ + PBogus, /* 6 */ + PBogus, /* 7 */ + PBogus, /* 8 */ + PNewUuid, /* 9 */ }; static int (*(OpioctlSw[])) () = { *************** *** 3809,3814 **** --- 3816,3836 ---- return code; } + DECL_PIOCTL(PNewUuid) + { + /*AFS_STATCNT(PNewUuid); */ + if (!afs_resourceinit_flag) /* afs deamons havn't started yet */ + return EIO; /* Inappropriate ioctl for device */ + + if (!afs_osi_suser(acred)) + return EACCES; + + ObtainWriteLock(&afs_xinterface, 555); + afs_uuid_create(&afs_cb_interface.uuid); + ReleaseWriteLock(&afs_xinterface); + ForceAllNewConnections(); + } + DECL_PIOCTL(PCallBackAddr) { #ifndef UKERNEL Index: openafs/src/afs/afs_prototypes.h diff -c openafs/src/afs/afs_prototypes.h:1.74.2.6 openafs/src/afs/afs_prototypes.h:1.74.2.7 *** openafs/src/afs/afs_prototypes.h:1.74.2.6 Mon Jan 22 12:20:38 2007 --- openafs/src/afs/afs_prototypes.h Wed Jun 27 12:30:46 2007 *************** *** 735,740 **** --- 735,741 ---- afs_int32 acell, u_short aport, afs_int32 locktype, afsUUID * uuidp, afs_int32 addr_uniquifier); + extern void ForceAllNewConnections(void); extern void afs_MarkServerUpOrDown(struct srvAddr *sa, int a_isDown); extern void afs_ServerDown(struct srvAddr *sa); extern void afs_CountServers(void); Index: openafs/src/afs/afs_server.c diff -c openafs/src/afs/afs_server.c:1.43.4.1 openafs/src/afs/afs_server.c:1.43.4.2 *** openafs/src/afs/afs_server.c:1.43.4.1 Thu Nov 9 19:20:19 2006 --- openafs/src/afs/afs_server.c Tue Jun 12 15:14:07 2007 *************** *** 33,39 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.43.4.1 2006/11/10 00:20:19 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 33,39 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.43.4.2 2007/06/12 19:14:07 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 488,493 **** --- 488,529 ---- } /*afs_CountServers */ + void + ForceAllNewConnections() + { + int srvAddrCount; + struct srvAddr **addrs; + struct srvAddr *sa; + afs_int32 i, j; + + ObtainReadLock(&afs_xserver); /* Necessary? */ + ObtainReadLock(&afs_xsrvAddr); + + srvAddrCount = 0; + for (i = 0; i < NSERVERS; i++) { + for (sa = afs_srvAddrs[i]; sa; sa = sa->next_bkt) { + srvAddrCount++; + } + } + + addrs = afs_osi_Alloc(srvAddrCount * sizeof(*addrs)); + j = 0; + for (i = 0; i < NSERVERS; i++) { + for (sa = afs_srvAddrs[i]; sa; sa = sa->next_bkt) { + if (j >= srvAddrCount) + break; + addrs[j++] = sa; + } + } + + ReleaseReadLock(&afs_xsrvAddr); + ReleaseReadLock(&afs_xserver); + for (i = 0; i < j; i++) { + sa = addrs[i]; + ForceNewConnections(sa); + } + } + /* check down servers (if adown), or running servers (if !adown) */ void afs_CheckServers(int adown, struct cell *acellp) Index: openafs/src/afs/afs_syscall.c diff -c openafs/src/afs/afs_syscall.c:1.1.2.4 openafs/src/afs/afs_syscall.c:1.1.2.5 *** openafs/src/afs/afs_syscall.c:1.1.2.4 Wed Oct 11 08:27:18 2006 --- openafs/src/afs/afs_syscall.c Mon Jun 18 13:06:24 2007 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_syscall.c,v 1.1.2.4 2006/10/11 12:27:18 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_syscall.c,v 1.1.2.5 2007/06/18 17:06:24 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 705,711 **** } #if defined(AFS_DARWIN80_ENV) ! put_vfs_context(); #endif #ifdef AFS_LINUX20_ENV code = -code; --- 705,712 ---- } #if defined(AFS_DARWIN80_ENV) ! if (uap->syscall != AFSCALL_CALL) ! put_vfs_context(); #endif #ifdef AFS_LINUX20_ENV code = -code; Index: openafs/src/afs/AIX/osi_sleep.c diff -c openafs/src/afs/AIX/osi_sleep.c:1.10 openafs/src/afs/AIX/osi_sleep.c:1.10.14.1 *** openafs/src/afs/AIX/osi_sleep.c:1.10 Tue Jul 15 19:14:17 2003 --- openafs/src/afs/AIX/osi_sleep.c Mon Jun 25 16:24:10 2007 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/AIX/osi_sleep.c,v 1.10 2003/07/15 23:14:17 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/AIX/osi_sleep.c,v 1.10.14.1 2007/06/25 20:24:10 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 26,32 **** --- 26,35 ---- static void AfsWaitHack(struct trb *trb) { + #if 0 + /* this gets called at interrupt context; let's not tempt fate... */ AFS_STATCNT(WaitHack); + #endif e_clear_wait(trb->func_data, THREAD_TIMED_OUT); } *************** *** 121,127 **** evp = evp->next; } if (!newp) { ! newp = (afs_event_t *) osi_AllocSmallSpace(sizeof(afs_event_t)); afs_evhashcnt++; newp->next = afs_evhasht[hashcode]; afs_evhasht[hashcode] = newp; --- 124,130 ---- evp = evp->next; } if (!newp) { ! newp = (afs_event_t *) xmalloc(sizeof(afs_event_t), 5, pinned_heap); afs_evhashcnt++; newp->next = afs_evhasht[hashcode]; afs_evhasht[hashcode] = newp; Index: openafs/src/afs/LINUX/osi_module.c diff -c openafs/src/afs/LINUX/osi_module.c:1.74.2.6 openafs/src/afs/LINUX/osi_module.c:1.74.2.7 *** openafs/src/afs/LINUX/osi_module.c:1.74.2.6 Thu Feb 8 20:30:17 2007 --- openafs/src/afs/LINUX/osi_module.c Mon Jul 9 16:00:35 2007 *************** *** 15,21 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_module.c,v 1.74.2.6 2007/02/09 01:30:17 shadow Exp $"); #include /* early to avoid printf->printk mapping */ #include "afs/sysincludes.h" --- 15,21 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_module.c,v 1.74.2.7 2007/07/09 20:00:35 shadow Exp $"); #include /* early to avoid printf->printk mapping */ #include "afs/sysincludes.h" *************** *** 96,102 **** err = afs_init_inodecache(); if (err) return err; ! register_filesystem(&afs_fs_type); osi_sysctl_init(); #ifdef LINUX_KEYRING_SUPPORT osi_keyring_init(); --- 96,105 ---- err = afs_init_inodecache(); if (err) return err; ! err = register_filesystem(&afs_fs_type); ! if (err) ! return err; ! osi_sysctl_init(); #ifdef LINUX_KEYRING_SUPPORT osi_keyring_init(); Index: openafs/src/afs/LINUX/osi_probe.c diff -c openafs/src/afs/LINUX/osi_probe.c:1.11.2.9 openafs/src/afs/LINUX/osi_probe.c:1.11.2.11 *** openafs/src/afs/LINUX/osi_probe.c:1.11.2.9 Tue Feb 13 17:54:11 2007 --- openafs/src/afs/LINUX/osi_probe.c Wed Jun 27 17:23:07 2007 *************** *** 512,520 **** /* symbol in section to try scanning */ #if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) (unsigned long)&sys_close, ! #elif defined(AFS_AMD64_LINUX20_ENV) /* On this platform, it's in a different section! */ (unsigned long)&generic_ro_fops, #else (unsigned long)&init_mm, #endif --- 512,523 ---- /* symbol in section to try scanning */ #if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) (unsigned long)&sys_close, ! #elif defined(AFS_AMD64_LINUX26_ENV) /* On this platform, it's in a different section! */ (unsigned long)&generic_ro_fops, + #elif defined(AFS_AMD64_LINUX20_ENV) + /* On this platform, it's in a different section! */ + (unsigned long)&tasklist_lock, #else (unsigned long)&init_mm, #endif *************** *** 535,544 **** (unsigned long)(&init_mm), 0x1fffff, 0x30000, ! #elif defined(AFS_AMD64_LINUX20_ENV) (unsigned long)(&generic_ro_fops) - 0x30000, 0, 0x6000, #elif defined(AFS_PPC64_LINUX26_ENV) (unsigned long)(&do_signal), 0xfff, --- 538,551 ---- (unsigned long)(&init_mm), 0x1fffff, 0x30000, ! #elif defined(AFS_AMD64_LINUX26_ENV) (unsigned long)(&generic_ro_fops) - 0x30000, 0, 0x6000, + #elif defined(AFS_AMD64_LINUX20_ENV) + (unsigned long)(&tasklist_lock) - 0x30000, + 0, + 0x6000, #elif defined(AFS_PPC64_LINUX26_ENV) (unsigned long)(&do_signal), 0xfff, Index: openafs/src/afs/LINUX/osi_sleep.c diff -c openafs/src/afs/LINUX/osi_sleep.c:1.30.4.2 openafs/src/afs/LINUX/osi_sleep.c:1.30.4.3 *** openafs/src/afs/LINUX/osi_sleep.c:1.30.4.2 Thu Jan 4 16:17:05 2007 --- openafs/src/afs/LINUX/osi_sleep.c Tue Jun 12 01:44:05 2007 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_sleep.c,v 1.30.4.2 2007/01/04 21:17:05 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_sleep.c,v 1.30.4.3 2007/06/12 05:44:05 rra Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 205,211 **** --- 205,215 ---- #if defined(STRUCT_TASK_STRUCT_HAS_TODO) !current->todo #else + #if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO) test_ti_thread_flag(current->thread_info, TIF_FREEZE) + #else + test_ti_thread_flag(task_thread_info(current), TIF_FREEZE) + #endif #endif #endif ) *************** *** 303,309 **** --- 307,317 ---- #if defined(STRUCT_TASK_STRUCT_HAS_TODO) !current->todo #else + #if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO) test_ti_thread_flag(current->thread_info, TIF_FREEZE) + #else + test_ti_thread_flag(task_thread_info(current), TIF_FREEZE) + #endif #endif #endif ) Index: openafs/src/afs/LINUX/osi_sysctl.c diff -c openafs/src/afs/LINUX/osi_sysctl.c:1.9.2.2 openafs/src/afs/LINUX/osi_sysctl.c:1.9.2.4 *** openafs/src/afs/LINUX/osi_sysctl.c:1.9.2.2 Thu Feb 22 16:47:26 2007 --- openafs/src/afs/LINUX/osi_sysctl.c Sat Jun 23 02:33:18 2007 *************** *** 1,7 **** /* * osi_sysctl.c: Linux sysctl interface to OpenAFS * ! * $Id: osi_sysctl.c,v 1.9.2.2 2007/02/22 21:47:26 shadow Exp $ * * Written Jan 30, 2002 by Kris Van Hees (Sine Nomine Associates) */ --- 1,7 ---- /* * osi_sysctl.c: Linux sysctl interface to OpenAFS * ! * $Id: osi_sysctl.c,v 1.9.2.4 2007/06/23 06:33:18 shadow Exp $ * * Written Jan 30, 2002 by Kris Van Hees (Sine Nomine Associates) */ *************** *** 35,101 **** static struct ctl_table_header *afs_sysctl = NULL; static ctl_table afs_sysctl_table[] = { ! {1, "hm_retry_RO", ! &hm_retry_RO, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {2, "hm_retry_RW", ! &hm_retry_RW, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {3, "hm_retry_int", ! &hm_retry_int, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {4, "GCPAGs", ! &afs_gcpags, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {5, "rx_deadtime", ! &afs_rx_deadtime, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {6, "bkVolPref", ! &afs_bkvolpref, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {7, "afs_blocksUsed", ! &afs_blocksUsed, sizeof(afs_int32), 0444, NULL, ! &proc_dointvec} ! , ! {8, "afs_blocksUsed_0", ! &afs_blocksUsed_0, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {9, "afs_blocksUsed_1", ! &afs_blocksUsed_1, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {10, "afs_blocksUsed_2", ! &afs_blocksUsed_2, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {11, "afs_pct1", ! &afs_pct1, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {12, "afs_pct2", ! &afs_pct2, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {13, "afs_cacheBlocks", ! &afs_cacheBlocks, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , ! {7, "md5inum", ! &afs_new_inum, sizeof(afs_int32), 0644, NULL, ! &proc_dointvec} ! , {0} }; static ctl_table fs_sysctl_table[] = { ! {1, "afs", NULL, 0, 0555, afs_sysctl_table}, {0} }; --- 35,162 ---- static struct ctl_table_header *afs_sysctl = NULL; static ctl_table afs_sysctl_table[] = { ! { ! .ctl_name = 1, ! .procname = "hm_retry_RO", ! .data = &hm_retry_RO, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 2, ! .procname = "hm_retry_RW", ! .data = &hm_retry_RW, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 3, ! .procname = "hm_retry_int", ! .data = &hm_retry_int, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 4, ! .procname = "GCPAGs", ! .data = &afs_gcpags, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 5, ! .procname = "rx_deadtime", ! .data = &afs_rx_deadtime, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 6, ! .procname = "bkVolPref", ! .data = &afs_bkvolpref, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 7, ! .procname = "afs_blocksUsed", ! .data = &afs_blocksUsed, ! .maxlen = sizeof(afs_int32), ! .mode = 0444, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 8, ! .procname = "afs_blocksUsed_0", ! .data = &afs_blocksUsed_0, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 9, ! .procname = "afs_blocksUsed_1", ! .data = &afs_blocksUsed_1, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 10, ! .procname = "afs_blocksUsed_2", ! .data = &afs_blocksUsed_2, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 11, ! .procname = "afs_pct1", ! .data = &afs_pct1, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 12, ! .procname = "afs_pct2", ! .data = &afs_pct2, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 13, ! .procname = "afs_cacheBlocks", ! .data = &afs_cacheBlocks, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, ! { ! .ctl_name = 14, ! .procname = "md5inum", ! .data = &afs_new_inum, ! .maxlen = sizeof(afs_int32), ! .mode = 0644, ! .proc_handler = &proc_dointvec ! }, {0} }; static ctl_table fs_sysctl_table[] = { ! { ! .ctl_name = 1, ! .procname = "afs", ! .mode = 0555, ! .child = afs_sysctl_table ! }, {0} }; Index: openafs/src/afs/LINUX/osi_vfsops.c diff -c openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.14 openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.17 *** openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.14 Thu Feb 8 20:23:40 2007 --- openafs/src/afs/LINUX/osi_vfsops.c Tue Jun 26 01:42:05 2007 *************** *** 16,22 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.42.4.14 2007/02/09 01:23:40 shadow Exp $"); #define __NO_VERSION__ /* don't define kernel_version in module.h */ #include /* early to avoid printf->printk mapping */ --- 16,22 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.42.4.17 2007/06/26 05:42:05 jaltman Exp $"); #define __NO_VERSION__ /* don't define kernel_version in module.h */ #include /* early to avoid printf->printk mapping */ *************** *** 108,113 **** --- 108,114 ---- struct backing_dev_info afs_backing_dev_info = { .ra_pages = 0, /* disable readahead, afs does prefetch */ }; + #endif int afs_fill_super(struct super_block *sb, void *data, int silent) *************** *** 298,305 **** --- 299,308 ---- { struct vcache *vcp = (struct vcache *) foo; + #if defined(SLAB_CTOR_VERIFY) if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == SLAB_CTOR_CONSTRUCTOR) + #endif inode_init_once(AFSTOV(vcp)); } *************** *** 322,328 **** void afs_destroy_inodecache(void) { ! (void) kmem_cache_destroy(afs_inode_cachep); } #else int --- 325,332 ---- void afs_destroy_inodecache(void) { ! if (afs_inode_cachep) ! (void) kmem_cache_destroy(afs_inode_cachep); } #else int *************** *** 453,458 **** --- 457,463 ---- .notify_change = afs_notify_change, #endif }; + #endif /************** Support routines ************************/ Index: openafs/src/afs/LINUX/osi_vnodeops.c diff -c openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.16 openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.17 *** openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.16 Thu May 17 14:36:02 2007 --- openafs/src/afs/LINUX/osi_vnodeops.c Tue Jun 12 14:34:18 2007 *************** *** 22,28 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.126.2.16 2007/05/17 18:36:02 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" --- 22,28 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.126.2.17 2007/06/12 18:34:18 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" *************** *** 575,581 **** --- 575,585 ---- * afs_StoreAllSegments() with AFS_LASTSTORE */ static int + #if defined(FOP_FLUSH_TAKES_FL_OWNER_T) + afs_linux_flush(struct file *fp, fl_owner_t id) + #else afs_linux_flush(struct file *fp) + #endif { struct vrequest treq; struct vcache *vcp = VTOAFS(FILE_INODE(fp)); Index: openafs/src/afsd/afsd.c diff -c openafs/src/afsd/afsd.c:1.60.2.3 openafs/src/afsd/afsd.c:1.60.2.6 *** openafs/src/afsd/afsd.c:1.60.2.3 Thu Feb 8 20:00:18 2007 --- openafs/src/afsd/afsd.c Tue Jun 26 15:13:37 2007 *************** *** 58,64 **** #include RCSID ! ("$Header: /cvs/openafs/src/afsd/afsd.c,v 1.60.2.3 2007/02/09 01:00:18 shadow Exp $"); #define VFS 1 --- 58,64 ---- #include RCSID ! ("$Header: /cvs/openafs/src/afsd/afsd.c,v 1.60.2.6 2007/06/26 19:13:37 shadow Exp $"); #define VFS 1 *************** *** 164,169 **** --- 164,199 ---- kern_return_t DiskArbDiskAppearedWithMountpointPing_auto(char *, unsigned int, char *); #define DISK_ARB_NETWORK_DISK_FLAG 8 + + #include + #include + #include + + #include + + #include + #include + + #include + #include + + #include + + typedef struct DNSSDState + { + DNSServiceRef service; + CFRunLoopSourceRef source; + CFSocketRef socket; + } DNSSDState; + + static io_connect_t root_port; + static IONotificationPortRef notify; + static io_object_t iterator; + static CFRunLoopSourceRef source; + static DNSSDState dnsstate; + + static int event_pid; + #endif /* AFS_DARWIN_ENV */ #ifndef MOUNT_AFS *************** *** 314,319 **** --- 344,505 ---- static int HandleMTab(); + #ifdef AFS_DARWIN_ENV + static void + afsd_sleep_callback(void * refCon, io_service_t service, + natural_t messageType, void * messageArgument ) + { + afs_int32 code; + + switch (messageType) { + case kIOMessageCanSystemSleep: + /* Idle sleep is about to kick in; can + prevent sleep by calling IOCancelPowerChange, otherwise + if we don't ack in 30s the system sleeps anyway */ + + /* allow it */ + IOAllowPowerChange(root_port, (long)messageArgument); + break; + + case kIOMessageSystemWillSleep: + /* The system WILL go to sleep. Ack or suffer delay */ + + IOAllowPowerChange(root_port, (long)messageArgument); + break; + + case kIOMessageSystemWillRestart: + /* The system WILL restart. Ack or suffer delay */ + + IOAllowPowerChange(root_port, (long)messageArgument); + break; + + case kIOMessageSystemWillPowerOn: + case kIOMessageSystemHasPoweredOn: + /* coming back from sleep */ + + IOAllowPowerChange(root_port, (long)messageArgument); + break; + + default: + IOAllowPowerChange(root_port, (long)messageArgument); + break; + } + } + + static void + afsd_update_addresses(CFRunLoopTimerRef timer, void *info) + { + /* parse multihomed address files */ + afs_int32 addrbuf[MAXIPADDRS], maskbuf[MAXIPADDRS], + mtubuf[MAXIPADDRS]; + char reason[1024]; + afs_int32 code; + + code = + parseNetFiles(addrbuf, maskbuf, mtubuf, MAXIPADDRS, reason, + AFSDIR_CLIENT_NETINFO_FILEPATH, + AFSDIR_CLIENT_NETRESTRICT_FILEPATH); + + if (code > 0) { + /* Note we're refreshing */ + code = code | 0x40000000; + call_syscall(AFSOP_ADVISEADDR, code, addrbuf, maskbuf, mtubuf); + } else + printf("ADVISEADDR: Error in specifying interface addresses:%s\n", + reason); + } + + /* This function is called when the system's ip addresses may have changed. */ + static void + afsd_ipaddr_callback (SCDynamicStoreRef store, CFArrayRef changed_keys, void *info) + { + CFRunLoopTimerRef timer; + + timer = CFRunLoopTimerCreate (NULL, CFAbsoluteTimeGetCurrent () + 1.0, + 0.0, 0, 0, afsd_update_addresses, NULL); + CFRunLoopAddTimer (CFRunLoopGetCurrent (), timer, + kCFRunLoopDefaultMode); + CFRelease (timer); + } + + static void + afsd_event_cleanup(int signo) { + DNSSDState *query = &dnsstate; + + CFRunLoopRemoveSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); + CFRelease (source); + IODeregisterForSystemPower(iterator); + IOServiceClose(root_port); + IONotificationPortDestroy(notify); + + exit(0); + } + + /* Adapted from "Living in a Dynamic TCP/IP Environment" technote. */ + static Boolean + afsd_install_events(void) + { + SCDynamicStoreContext ctx = {0}; + SCDynamicStoreRef store; + + root_port = IORegisterForSystemPower(0,¬ify,afsd_sleep_callback,&iterator); + + if (root_port) { + CFRunLoopAddSource(CFRunLoopGetCurrent(), + IONotificationPortGetRunLoopSource(notify), + kCFRunLoopDefaultMode); + } + + + store = SCDynamicStoreCreate (NULL, + CFSTR ("AddIPAddressListChangeCallbackSCF"), + afsd_ipaddr_callback, &ctx); + + if (store) { + const void *keys[1]; + + /* Request IPV4 address change notification */ + keys[0] = (SCDynamicStoreKeyCreateNetworkServiceEntity + (NULL, kSCDynamicStoreDomainState, + kSCCompAnyRegex, kSCEntNetIPv4)); + + #if 0 + /* This should tell us when the hostname(s) change. do we care? */ + keys[N] = SCDynamicStoreKeyCreateHostNames (NULL); + #endif + + if (keys[0] != NULL) { + CFArrayRef pattern_array; + + pattern_array = CFArrayCreate (NULL, keys, 1, + &kCFTypeArrayCallBacks); + + if (pattern_array != NULL) + { + SCDynamicStoreSetNotificationKeys (store, NULL, pattern_array); + source = SCDynamicStoreCreateRunLoopSource (NULL, store, 0); + + CFRelease (pattern_array); + } + + if (keys[0] != NULL) + CFRelease (keys[0]); + } + + CFRelease (store); + } + + if (source != NULL) { + CFRunLoopAddSource (CFRunLoopGetCurrent(), + source, kCFRunLoopDefaultMode); + } + + signal(SIGTERM, afsd_event_cleanup); + + CFRunLoopRun(); + } + #endif + /* ParseArgs is now obsolete, being handled by cmd */ /*------------------------------------------------------------------------------ *************** *** 1251,1256 **** --- 1437,1452 ---- kernelMsg[1] = 0; acellName[0] = '\0'; + #ifdef AFS_DARWIN_ENV + /* Fork the event handler also. */ + code = fork(); + if (code == 0) { + afsd_install_events(); + exit(1); + } else if (code != -1) { + event_pid = code; + } + #endif while (1) { /* On some platforms you only get 4 args to an AFS call */ int sizeArg = ((sizeof acellName) << 16) | (sizeof kernelMsg); *************** *** 1280,1286 **** acellName[sizeof(acellName) - 1] = '\0'; } } ! exit(1); } #endif --- 1476,1484 ---- acellName[sizeof(acellName) - 1] = '\0'; } } ! #ifdef AFS_DARWIN_ENV ! kill(event_pid, SIGTERM); ! #endif exit(1); } #endif *************** *** 1758,1767 **** exit(1); #endif } - #if 0 - fputs(AFS_GOVERNMENT_MESSAGE, stdout); - fflush(stdout); - #endif /* * Set up all the kernel processes needed for AFS. --- 1956,1961 ---- Index: openafs/src/aklog/aklog.h diff -c openafs/src/aklog/aklog.h:1.5 openafs/src/aklog/aklog.h:1.5.2.1 *** openafs/src/aklog/aklog.h:1.5 Mon Mar 20 12:29:28 2006 --- openafs/src/aklog/aklog.h Wed Jul 11 00:31:06 2007 *************** *** 1,5 **** /* ! * $Id: aklog.h,v 1.5 2006/03/20 17:29:28 jaltman Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" --- 1,5 ---- /* ! * $Id: aklog.h,v 1.5.2.1 2007/07/11 04:31:06 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" *************** *** 9,15 **** #define __AKLOG_H__ #if !defined(lint) && !defined(SABER) ! static char *rcsid_aklog_h = "$Id: aklog.h,v 1.5 2006/03/20 17:29:28 jaltman Exp $"; #endif /* lint || SABER */ #include --- 9,15 ---- #define __AKLOG_H__ #if !defined(lint) && !defined(SABER) ! static char *rcsid_aklog_h = "$Id: aklog.h,v 1.5.2.1 2007/07/11 04:31:06 shadow Exp $"; #endif /* lint || SABER */ #include *************** *** 51,56 **** --- 51,60 ---- #define INST_SZ 40 #endif /* INST_SZ */ + #ifndef u_int32_t + #define u_int32_t uint32_t + #endif + struct ktext { unsigned int length; unsigned char dat[MAX_KTXT_LEN]; Index: openafs/src/aklog/aklog_main.c diff -c openafs/src/aklog/aklog_main.c:1.12.2.5 openafs/src/aklog/aklog_main.c:1.12.2.6 *** openafs/src/aklog/aklog_main.c:1.12.2.5 Tue Apr 10 14:39:49 2007 --- openafs/src/aklog/aklog_main.c Wed Jul 11 00:31:06 2007 *************** *** 1,5 **** /* ! * $Id: aklog_main.c,v 1.12.2.5 2007/04/10 18:39:49 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" --- 1,5 ---- /* ! * $Id: aklog_main.c,v 1.12.2.6 2007/07/11 04:31:06 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" *************** *** 7,13 **** #if !defined(lint) && !defined(SABER) static char *rcsid = ! "$Id: aklog_main.c,v 1.12.2.5 2007/04/10 18:39:49 shadow Exp $"; #endif /* lint || SABER */ #include --- 7,13 ---- #if !defined(lint) && !defined(SABER) static char *rcsid = ! "$Id: aklog_main.c,v 1.12.2.6 2007/07/11 04:31:06 shadow Exp $"; #endif /* lint || SABER */ #include *************** *** 202,208 **** #if !defined(HAVE_KRB5_524_CONVERT_CREDS) && defined(HAVE_KRB524_CONVERT_CREDS_KDC) #define krb5_524_convert_creds krb524_convert_creds_kdc #elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && !defined(HAVE_KRB524_CONVERT_CREDS_KDC) ! #error "You must have one of krb5_524_convert_creds or krb524_convert_creds_kdc available" #endif #endif /* WINDOWS */ --- 202,208 ---- #if !defined(HAVE_KRB5_524_CONVERT_CREDS) && defined(HAVE_KRB524_CONVERT_CREDS_KDC) #define krb5_524_convert_creds krb524_convert_creds_kdc #elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && !defined(HAVE_KRB524_CONVERT_CREDS_KDC) ! #define HAVE_NO_KRB5_524 #endif #endif /* WINDOWS */ *************** *** 668,673 **** --- 668,674 ---- get_cred_keylen(v5cred)); atoken.ticketLen = v5cred->ticket.length; memcpy(atoken.ticket, v5cred->ticket.data, atoken.ticketLen); + #ifndef HAVE_NO_KRB5_524 } else { CREDENTIALS cred; *************** *** 702,707 **** --- 703,709 ---- memcpy(&atoken.sessionKey, cred.session, 8); atoken.ticketLen = cred.ticket_st.length; memcpy(atoken.ticket, cred.ticket_st.dat, atoken.ticketLen); + #endif /* HAVE_NO_KRB5_524 */ } if (!force && *************** *** 1224,1230 **** "[-d] [[-cell | -c] cell [-k krb_realm]] ", "[[-p | -path] pathname]\n", " [-zsubs] [-hosts] [-noauth] [-noprdb] [-force] [-setpag] \n" ! " [-linked] [-524]\n"); fprintf(stderr, " -d gives debugging information.\n"); fprintf(stderr, " krb_realm is the kerberos realm of a cell.\n"); fprintf(stderr, " pathname is the name of a directory to which "); --- 1226,1236 ---- "[-d] [[-cell | -c] cell [-k krb_realm]] ", "[[-p | -path] pathname]\n", " [-zsubs] [-hosts] [-noauth] [-noprdb] [-force] [-setpag] \n" ! " [-linked]" ! #ifndef HAVE_NO_KRB5_524 ! " [-524]" ! #endif ! "\n"); fprintf(stderr, " -d gives debugging information.\n"); fprintf(stderr, " krb_realm is the kerberos realm of a cell.\n"); fprintf(stderr, " pathname is the name of a directory to which "); *************** *** 1236,1242 **** --- 1242,1250 ---- fprintf(stderr, " -force means replace identical tickets. \n"); fprintf(stderr, " -linked means if AFS node is linked, try both. \n"); fprintf(stderr, " -setpag set the AFS process authentication group.\n"); + #ifndef HAVE_NO_KRB5_524 fprintf(stderr, " -524 means use the 524 converter instead of V5 directly\n"); + #endif fprintf(stderr, " No commandline arguments means "); fprintf(stderr, "authenticate to the local cell.\n"); fprintf(stderr, "\n"); *************** *** 1309,1316 **** --- 1317,1326 ---- linked++; else if (strcmp(argv[i], "-force") == 0) force++; + #ifndef HAVE_NO_KRB5_524 else if (strcmp(argv[i], "-524") == 0) do524++; + #endif else if (strcmp(argv[i], "-setpag") == 0) afssetpag++; else if (((strcmp(argv[i], "-cell") == 0) || Index: openafs/src/auth/NTMakefile diff -c openafs/src/auth/NTMakefile:1.10.4.1 openafs/src/auth/NTMakefile:1.10.4.2 *** openafs/src/auth/NTMakefile:1.10.4.1 Sun Jul 2 21:06:01 2006 --- openafs/src/auth/NTMakefile Mon Jul 2 20:35:14 2007 *************** *** 8,13 **** --- 8,14 ---- RELDIR=auth !INCLUDE ..\config\NTMakefile.$(SYS_NAME) !INCLUDE ..\config\NTMakefile.version + AFSDEV_AUXCDEFINES = -DAFS_AFSDB_ENV INCFILEDIR = $(DESTDIR)\include\afs # header file install directory Index: openafs/src/auth/cellconfig.c diff -c openafs/src/auth/cellconfig.c:1.47.2.8 openafs/src/auth/cellconfig.c:1.47.2.9 *** openafs/src/auth/cellconfig.c:1.47.2.8 Sat Dec 30 11:58:15 2006 --- openafs/src/auth/cellconfig.c Mon Jul 2 20:35:14 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/auth/cellconfig.c,v 1.47.2.8 2006/12/30 16:58:15 jaltman Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/auth/cellconfig.c,v 1.47.2.9 2007/07/03 00:35:14 jaltman Exp $"); #include #include *************** *** 534,540 **** char tbuffer[256], tbuf1[256]; struct stat tstat; ! /* figure out the cell name */ #ifdef AFS_NT40_ENV i = GetCellNT(adir); #else --- 534,540 ---- char tbuffer[256], tbuf1[256]; struct stat tstat; ! /* figure out the local cell name */ #ifdef AFS_NT40_ENV i = GetCellNT(adir); #else Index: openafs/src/bucoord/commands.c diff -c openafs/src/bucoord/commands.c:1.18.2.3 openafs/src/bucoord/commands.c:1.18.2.4 *** openafs/src/bucoord/commands.c:1.18.2.3 Tue Apr 10 14:39:50 2007 --- openafs/src/bucoord/commands.c Sat Jun 23 11:14:53 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/commands.c,v 1.18.2.3 2007/04/10 18:39:50 shadow Exp $"); #include #if defined(AFS_LINUX24_ENV) --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/commands.c,v 1.18.2.4 2007/06/23 15:14:53 shadow Exp $"); #include #if defined(AFS_LINUX24_ENV) *************** *** 1139,1144 **** --- 1139,1145 ---- afs_int32 code; int oldFlag; afs_int32 fromDate; + afs_int32 dumpID = 0; char *newExt, *timeString; afs_int32 i; afs_int32 *ports = NULL; *************** *** 1233,1245 **** dontExecute = (as->parms[6].items ? 1 : 0); /* -n */ /* * Perform the call to start the restore. */ code = bc_StartDmpRst(bc_globalConfig, "volume", "restore", volsToRestore, &destServ, destPartition, fromDate, newExt, oldFlag, ! /*parentDump */ 0, /*dumpLevel */ 0, bc_Restorer, ports, portCount, /*dumpSched */ NULL, /*append */ 0, dontExecute); if (code) --- 1234,1253 ---- dontExecute = (as->parms[6].items ? 1 : 0); /* -n */ + if (as->parms[7].items) + { + dumpID = atoi(as->parms[7].items->data); + if (dumpID <= 0) + dumpID = 0; + } + /* * Perform the call to start the restore. */ code = bc_StartDmpRst(bc_globalConfig, "volume", "restore", volsToRestore, &destServ, destPartition, fromDate, newExt, oldFlag, ! /*parentDump */ dumpID, /*dumpLevel */ 0, bc_Restorer, ports, portCount, /*dumpSched */ NULL, /*append */ 0, dontExecute); if (code) Index: openafs/src/bucoord/main.c diff -c openafs/src/bucoord/main.c:1.16.14.2 openafs/src/bucoord/main.c:1.16.14.3 *** openafs/src/bucoord/main.c:1.16.14.2 Tue Apr 10 14:39:50 2007 --- openafs/src/bucoord/main.c Sat Jun 23 11:14:53 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/main.c,v 1.16.14.2 2007/04/10 18:39:50 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/main.c,v 1.16.14.3 2007/06/23 15:14:53 shadow Exp $"); #include #include *************** *** 544,549 **** --- 544,551 ---- "date from which to restore"); cmd_AddParm(ts, "-portoffset", CMD_LIST, CMD_OPTIONAL, "TC port offsets"); cmd_AddParm(ts, "-n", CMD_FLAG, CMD_OPTIONAL, "don't really execute it"); + cmd_AddParm(ts, "-usedump", CMD_SINGLE, CMD_OPTIONAL, + "specify the dumpID to restore from"); if (!interact) add_std_args(ts); Index: openafs/src/bucoord/restore.c diff -c openafs/src/bucoord/restore.c:1.10.6.3 openafs/src/bucoord/restore.c:1.10.6.5 *** openafs/src/bucoord/restore.c:1.10.6.3 Thu May 17 02:14:06 2007 --- openafs/src/bucoord/restore.c Tue Jun 26 01:42:06 2007 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/restore.c,v 1.10.6.3 2007/05/17 06:14:06 shadow Exp $"); #include #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/restore.c,v 1.10.6.5 2007/06/26 05:42:06 jaltman Exp $"); #include #include *************** *** 216,241 **** for (tvol = dumpTaskPtr->volumes; tvol; tvol = tvol->next) { /*tvol */ strcpy(vname, tvol->name); dumpDescr = &dumpDescr1; ! code = bcdb_FindDump(vname, dumpTaskPtr->fromDate, dumpDescr); ! ! if (!BackupName(vname)) { /* See if backup volume is there */ ! strcat(vname, ".backup"); ! dumpDescr = &dumpDescr2; ! tcode = code; code = bcdb_FindDump(vname, dumpTaskPtr->fromDate, dumpDescr); ! if (code) { /* Can't find backup, go with first results */ strcpy(vname, tvol->name); dumpDescr = &dumpDescr1; code = tcode; ! } else if (!tcode) { /* Both found an entry, go with latest result */ if (dumpDescr1.created > dumpDescr2.created) { ! strcpy(vname, tvol->name); ! dumpDescr = &dumpDescr1; ! code = tcode; } } ! } if (code) { /* If FindDump took an error */ afs_com_err(whoami, code, "; Can't find any dump for volume %s", --- 216,267 ---- for (tvol = dumpTaskPtr->volumes; tvol; tvol = tvol->next) { /*tvol */ strcpy(vname, tvol->name); dumpDescr = &dumpDescr1; ! if (dumpTaskPtr->parentDumpID > 0) /* Told which dump to try */ ! { ! /* Right now, this assumes that all volumes listed will be ! * from the given dumpID. FIXME ! */ ! code = bcdb_FindDumpByID(dumpTaskPtr->parentDumpID, dumpDescr); ! if (code) ! { ! afs_com_err(whoami, "Couldn't look up info for dump %d\n", ! dumpTaskPtr->parentDumpID); ! continue; ! } ! code = bcdb_FindVolumes(dumpTaskPtr->parentDumpID, vname, volumeEntries, ! last, &next, MAXTAPESATONCE, &vecount); ! if (code) ! { ! if (!BackupName(vname)) ! { ! strcat(vname, ".backup"); ! code = bcdb_FindVolumes(dumpTaskPtr->parentDumpID, vname, volumeEntries, ! last, &next, MAXTAPESATONCE, &vecount); ! } ! } ! } ! else ! { code = bcdb_FindDump(vname, dumpTaskPtr->fromDate, dumpDescr); + if (!BackupName(vname)) { /* See if backup volume is there */ + strcat(vname, ".backup"); + dumpDescr = &dumpDescr2; + tcode = code; + code = bcdb_FindDump(vname, dumpTaskPtr->fromDate, dumpDescr); ! if (code) { /* Can't find backup, go with first results */ strcpy(vname, tvol->name); dumpDescr = &dumpDescr1; code = tcode; ! } else if (!tcode) { /* Both found an entry, go with latest result */ if (dumpDescr1.created > dumpDescr2.created) { ! strcpy(vname, tvol->name); ! dumpDescr = &dumpDescr1; ! code = tcode; } + } } ! } if (code) { /* If FindDump took an error */ afs_com_err(whoami, code, "; Can't find any dump for volume %s", Index: openafs/src/budb/database.c diff -c openafs/src/budb/database.c:1.7.14.1 openafs/src/budb/database.c:1.7.14.2 *** openafs/src/budb/database.c:1.7.14.1 Thu Feb 8 20:00:19 2007 --- openafs/src/budb/database.c Fri Jul 6 07:35:24 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/budb/database.c,v 1.7.14.1 2007/02/09 01:00:19 shadow Exp $"); #ifdef AFS_NT40_ENV #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/budb/database.c,v 1.7.14.2 2007/07/06 11:35:24 jaltman Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 74,84 **** */ afs_int32 ! dbwrite(ut, pos, buff, len) ! struct ubik_trans *ut; ! afs_int32 pos; ! char *buff; ! afs_int32 len; { afs_int32 code = 0; --- 74,80 ---- */ afs_int32 ! dbwrite(struct ubik_trans *ut, afs_int32 pos, void *buff, afs_int32 len) { afs_int32 code = 0; *************** *** 110,120 **** /* same thing for read */ afs_int32 ! dbread(ut, pos, buff, len) ! struct ubik_trans *ut; ! afs_int32 pos; ! char *buff; ! afs_int32 len; { afs_int32 code = 0; --- 106,112 ---- /* same thing for read */ afs_int32 ! dbread(struct ubik_trans *ut, afs_int32 pos, void *buff, afs_int32 len) { afs_int32 code = 0; *************** *** 145,156 **** /* Same as dbread excepts it does checking */ afs_int32 ! cdbread(ut, type, pos, buff, len) ! struct ubik_trans *ut; ! int type; ! afs_int32 pos; ! char *buff; ! afs_int32 len; { afs_int32 code = 0; --- 137,143 ---- /* Same as dbread excepts it does checking */ afs_int32 ! cdbread(struct ubik_trans *ut, int type, afs_int32 pos, void *buff, afs_int32 len) { afs_int32 code = 0; Index: openafs/src/budb/database.h diff -c openafs/src/budb/database.h:1.4 openafs/src/budb/database.h:1.4.14.1 *** openafs/src/budb/database.h:1.4 Sun Dec 7 17:49:19 2003 --- openafs/src/budb/database.h Fri Jul 6 07:35:24 2007 *************** *** 315,320 **** extern afs_uint32 ht_HashEntry(); extern dbadr ht_LookupBucket(); ! extern afs_int32 dbwrite(struct ubik_trans *ut, afs_int32 pos, char *buff, afs_int32 len); extern void db_panic(char *reason); extern void ht_Reset(struct memoryHashTable *mht); --- 315,322 ---- extern afs_uint32 ht_HashEntry(); extern dbadr ht_LookupBucket(); ! extern afs_int32 dbwrite(struct ubik_trans *ut, afs_int32 pos, void *buff, afs_int32 len); ! extern afs_int32 dbread(struct ubik_trans *ut, afs_int32 pos, void *buff, afs_int32 len); ! extern afs_int32 cdbread(struct ubik_trans *ut, int type, afs_int32 pos, void *buff, afs_int32 len); extern void db_panic(char *reason); extern void ht_Reset(struct memoryHashTable *mht); Index: openafs/src/budb/ol_verify.c diff -c openafs/src/budb/ol_verify.c:1.13 openafs/src/budb/ol_verify.c:1.13.14.1 *** openafs/src/budb/ol_verify.c:1.13 Sat Nov 29 17:08:09 2003 --- openafs/src/budb/ol_verify.c Fri Jul 6 07:40:40 2007 *************** *** 13,19 **** #include RCSID ! ("$Header: /cvs/openafs/src/budb/ol_verify.c,v 1.13 2003/11/29 22:08:09 jaltman Exp $"); #include #ifdef AFS_NT40_ENV --- 13,19 ---- #include RCSID ! ("$Header: /cvs/openafs/src/budb/ol_verify.c,v 1.13.14.1 2007/07/06 11:40:40 jaltman Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 303,311 **** return (typeName[index]); } ! getDumpID(ut, tapePtr, dumpID) ! struct tape *tapePtr; ! afs_int32 *dumpID; { struct dump d; afs_int32 code; --- 303,312 ---- return (typeName[index]); } ! int ! getDumpID(struct ubik_trans *ut, ! struct tape *tapePtr, ! afs_int32 *dumpID) { struct dump d; afs_int32 code; *************** *** 314,319 **** --- 315,321 ---- code = dbread(ut, ntohl(tapePtr->dump), &d, sizeof(d)); if (!code) *dumpID = ntohl(d.id); + return code; } /* ------------------------------------ Index: openafs/src/cf/linux-test2.m4 diff -c openafs/src/cf/linux-test2.m4:1.12.4.1 openafs/src/cf/linux-test2.m4:1.12.4.2 *** openafs/src/cf/linux-test2.m4:1.12.4.1 Fri Aug 4 11:45:33 2006 --- openafs/src/cf/linux-test2.m4 Tue Jun 12 14:39:41 2007 *************** *** 10,13 **** --- 10,14 ---- cp $tmpldir/osi_vfs.hin $outputdir/osi_vfs.h # chmod +x $configdir/make_vnode.pl # $configdir/make_vnode.pl -i $LINUX_KERNEL_PATH -t ${tmpldir} -o $outputdir + AC_MSG_RESULT(yes) ]) Index: openafs/src/cf/linux-test4.m4 diff -c openafs/src/cf/linux-test4.m4:1.29.2.24 openafs/src/cf/linux-test4.m4:1.29.2.26 *** openafs/src/cf/linux-test4.m4:1.29.2.24 Thu May 17 02:36:48 2007 --- openafs/src/cf/linux-test4.m4 Tue Jun 12 14:34:18 2007 *************** *** 444,449 **** --- 444,461 ---- AC_MSG_RESULT($ac_cv_linux_sched_struct_task_struct_has_exit_state)]) + AC_DEFUN([LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_THREAD_INFO], [ + AC_MSG_CHECKING([for thread_info in struct task_struct]) + AC_CACHE_VAL([ac_cv_linux_sched_struct_task_struct_has_thread_info], [ + AC_TRY_KBUILD( + [#include ], + [struct task_struct _tsk; + printk("%d\n", _tsk.thread_info);], + ac_cv_linux_sched_struct_task_struct_has_thread_info=yes, + ac_cv_linux_sched_struct_task_struct_has_thread_info=no)]) + AC_MSG_RESULT($ac_cv_linux_sched_struct_task_struct_has_thread_info)]) + + AC_DEFUN([LINUX_FS_STRUCT_SUPER_HAS_ALLOC_INODE], [ AC_MSG_CHECKING([for alloc_inode in struct super_operations]) AC_CACHE_VAL([ac_cv_linux_fs_struct_super_has_alloc_inode], [ *************** *** 846,848 **** --- 858,873 ---- ac_cv_linux_register_sysctl_table_noflag=no)]) AC_MSG_RESULT($ac_cv_linux_register_sysctl_table_noflag)]) + AC_DEFUN([LINUX_FOP_F_FLUSH_TAKES_FL_OWNER_T], [ + AC_MSG_CHECKING([whether file_operations.flush takes a fl_owner_t]) + AC_CACHE_VAL([ac_cv_linux_func_f_flush_takes_fl_owner_t], [ + AC_TRY_KBUILD( + [#include ], + [struct inode _inode; + struct file _file; + fl_owner_t id; + (void)_inode.i_fop->flush(&_file, &id);], + ac_cv_linux_func_f_flush_takes_fl_owner_t=yes, + ac_cv_linux_func_f_flush_takes_fl_owner_t=no)]) + AC_MSG_RESULT($ac_cv_linux_func_f_flush_takes_fl_owner_t)]) + Index: openafs/src/cf/osconf.m4 diff -c openafs/src/cf/osconf.m4:1.83.2.2 openafs/src/cf/osconf.m4:1.83.2.3 *** openafs/src/cf/osconf.m4:1.83.2.2 Thu Dec 28 17:02:16 2006 --- openafs/src/cf/osconf.m4 Mon Jun 18 14:18:48 2007 *************** *** 475,481 **** ;; *_darwin_80) ! AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration" LEX="lex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}' KROOT= --- 475,481 ---- ;; *_darwin_80) ! AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation" LEX="lex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}' KROOT= *************** *** 491,497 **** ;; *_darwin_90) ! AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration" LEX="lex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}' KROOT= --- 491,497 ---- ;; *_darwin_90) ! AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation" LEX="lex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}' KROOT= Index: openafs/src/config/NTMakefile.amd64_w2k diff -c openafs/src/config/NTMakefile.amd64_w2k:1.24.2.23 openafs/src/config/NTMakefile.amd64_w2k:1.24.2.25 *** openafs/src/config/NTMakefile.amd64_w2k:1.24.2.23 Thu May 17 12:12:52 2007 --- openafs/src/config/NTMakefile.amd64_w2k Tue Jul 10 16:17:28 2007 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2000 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2100 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) *************** *** 208,216 **** -I$(DESTDIR)\include\rx \ -DWIN32_LEAN_AND_MEAN \ -DSTRICT \ ! -D_WIN32_IE=0x0500 \ ! -D_WIN32_WINNT=0x0500 \ ! -DWINVER=0x0500 \ -DREGISTER_POWER_NOTIFICATIONS \ -DAFS_AFSDB_ENV \ -DAFS_FREELANCE_CLIENT \ --- 208,216 ---- -I$(DESTDIR)\include\rx \ -DWIN32_LEAN_AND_MEAN \ -DSTRICT \ ! -D_WIN32_IE=0x0502 \ ! -D_WIN32_WINNT=0x0502 \ ! -DWINVER=0x0502 \ -DREGISTER_POWER_NOTIFICATIONS \ -DAFS_AFSDB_ENV \ -DAFS_FREELANCE_CLIENT \ *************** *** 357,363 **** #################### Link optional build flags set ########### afslflags = $(afslflags) \ ! /FIXED:NO /VERBOSE:LIB !IF ("$(AFSVER_CL)"=="1400") afslflags = $(afslflags) /MANIFEST --- 357,363 ---- #################### Link optional build flags set ########### afslflags = $(afslflags) \ ! /FIXED:NO /VERBOSE:LIB /MACHINE:X64 !IF ("$(AFSVER_CL)"=="1400") afslflags = $(afslflags) /MANIFEST Index: openafs/src/config/NTMakefile.i386_nt40 diff -c openafs/src/config/NTMakefile.i386_nt40:1.84.2.23 openafs/src/config/NTMakefile.i386_nt40:1.84.2.24 *** openafs/src/config/NTMakefile.i386_nt40:1.84.2.23 Thu May 17 12:12:52 2007 --- openafs/src/config/NTMakefile.i386_nt40 Tue Jul 10 16:17:28 2007 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2000 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2100 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/config/NTMakefile.i386_w2k diff -c openafs/src/config/NTMakefile.i386_w2k:1.23.2.23 openafs/src/config/NTMakefile.i386_w2k:1.23.2.24 *** openafs/src/config/NTMakefile.i386_w2k:1.23.2.23 Thu May 17 12:12:52 2007 --- openafs/src/config/NTMakefile.i386_w2k Tue Jul 10 16:17:28 2007 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2000 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2100 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/config/param.ppc64_linux24.h diff -c openafs/src/config/param.ppc64_linux24.h:1.4.6.2 openafs/src/config/param.ppc64_linux24.h:1.4.6.3 *** openafs/src/config/param.ppc64_linux24.h:1.4.6.2 Thu Nov 9 18:18:45 2006 --- openafs/src/config/param.ppc64_linux24.h Wed Jun 6 13:33:28 2007 *************** *** 75,80 **** --- 75,86 ---- #endif #endif /* KERNEL */ + #ifdef __GLIBC__ + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) + #define USE_UCONTEXT + #endif + #endif + #endif /* _PARAM_PPC64_LINUX20_H_ */ #else /* !defined(UKERNEL) */ Index: openafs/src/config/param.ppc64_linux26.h diff -c openafs/src/config/param.ppc64_linux26.h:1.3.6.5 openafs/src/config/param.ppc64_linux26.h:1.3.6.6 *** openafs/src/config/param.ppc64_linux26.h:1.3.6.5 Thu Nov 9 18:18:45 2006 --- openafs/src/config/param.ppc64_linux26.h Wed Jun 6 13:33:28 2007 *************** *** 75,80 **** --- 75,86 ---- #endif #endif /* KERNEL */ + #ifdef __GLIBC__ + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) + #define USE_UCONTEXT + #endif + #endif + #endif /* _PARAM_PPC64_LINUX20_H_ */ #else /* !defined(UKERNEL) */ Index: openafs/src/config/param.ppc_linux24.h diff -c openafs/src/config/param.ppc_linux24.h:1.12.6.2 openafs/src/config/param.ppc_linux24.h:1.12.6.3 *** openafs/src/config/param.ppc_linux24.h:1.12.6.2 Thu Nov 9 18:18:45 2006 --- openafs/src/config/param.ppc_linux24.h Wed Jun 6 13:33:28 2007 *************** *** 72,77 **** --- 72,83 ---- #endif #endif /* KERNEL */ + #ifdef __GLIBC__ + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) + #define USE_UCONTEXT + #endif + #endif + #endif /* AFS_PARAM_H */ #else /* !defined(UKERNEL) */ Index: openafs/src/config/param.ppc_linux26.h diff -c openafs/src/config/param.ppc_linux26.h:1.3.6.5 openafs/src/config/param.ppc_linux26.h:1.3.6.6 *** openafs/src/config/param.ppc_linux26.h:1.3.6.5 Thu Nov 9 18:18:45 2006 --- openafs/src/config/param.ppc_linux26.h Wed Jun 6 13:33:28 2007 *************** *** 73,78 **** --- 73,84 ---- #endif #endif /* KERNEL */ + #ifdef __GLIBC__ + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) + #define USE_UCONTEXT + #endif + #endif + #endif /* AFS_PARAM_H */ #else /* !defined(UKERNEL) */ Index: openafs/src/config/param.sparc64_linux24.h diff -c openafs/src/config/param.sparc64_linux24.h:1.9.6.2 openafs/src/config/param.sparc64_linux24.h:1.9.6.3 *** openafs/src/config/param.sparc64_linux24.h:1.9.6.2 Thu Nov 9 18:18:45 2006 --- openafs/src/config/param.sparc64_linux24.h Wed Jun 6 13:33:28 2007 *************** *** 94,99 **** --- 94,105 ---- #endif #endif + #ifdef __GLIBC__ + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) + #define USE_UCONTEXT + #endif + #endif + #endif /* _PARAM_SPARC64_LINUX24_H_ */ #else /* !defined(UKERNEL) */ Index: openafs/src/config/param.sparc64_linux26.h diff -c openafs/src/config/param.sparc64_linux26.h:1.2.4.5 openafs/src/config/param.sparc64_linux26.h:1.2.4.6 *** openafs/src/config/param.sparc64_linux26.h:1.2.4.5 Thu Nov 9 18:18:45 2006 --- openafs/src/config/param.sparc64_linux26.h Wed Jun 6 13:33:28 2007 *************** *** 94,99 **** --- 94,105 ---- #endif #endif + #ifdef __GLIBC__ + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) + #define USE_UCONTEXT + #endif + #endif + #endif /* _PARAM_SPARC64_LINUX26_H_ */ #else /* !defined(UKERNEL) */ Index: openafs/src/config/param.sparc_linux24.h diff -c openafs/src/config/param.sparc_linux24.h:1.10.6.2 openafs/src/config/param.sparc_linux24.h:1.10.6.3 *** openafs/src/config/param.sparc_linux24.h:1.10.6.2 Thu Nov 9 18:18:45 2006 --- openafs/src/config/param.sparc_linux24.h Wed Jun 6 13:33:28 2007 *************** *** 98,103 **** --- 98,109 ---- #endif #endif + #ifdef __GLIBC__ + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) + #define USE_UCONTEXT + #endif + #endif + #endif /* AFS_PARAM_H */ #else /* !defined(UKERNEL) */ Index: openafs/src/config/venus.h diff -c openafs/src/config/venus.h:1.12.2.3 openafs/src/config/venus.h:1.12.2.4 *** openafs/src/config/venus.h:1.12.2.3 Mon Jul 31 17:27:40 2006 --- openafs/src/config/venus.h Tue Jun 12 15:14:11 2007 *************** *** 182,187 **** --- 182,188 ---- #define VIOC_GETALIAS _CVICEIOCTL(2) /* get alias info */ #define VIOC_CBADDR _CVICEIOCTL(3) /* push callback addr */ #define VIOC_DISCON _CVICEIOCTL(5) /* set/get discon mode */ + #define VIOC_NEWUUID _CVICEIOCTL(9) /* new uuid */ /* OpenAFS-specific 'O' pioctl's */ #define VIOC_NFS_NUKE_CREDS _OVICEIOCTL(1) /* nuke creds for all PAG's */ Index: openafs/src/des/des.c diff -c openafs/src/des/des.c:1.19 openafs/src/des/des.c:1.19.4.1 *** openafs/src/des/des.c:1.19 Thu Aug 18 00:55:00 2005 --- openafs/src/des/des.c Tue Jul 3 00:23:12 2007 *************** *** 37,43 **** #include RCSID ! ("$Header: /cvs/openafs/src/des/des.c,v 1.19 2005/08/18 04:55:00 shadow Exp $"); #ifndef KERNEL #include --- 37,43 ---- #include RCSID ! ("$Header: /cvs/openafs/src/des/des.c,v 1.19.4.1 2007/07/03 04:23:12 shadow Exp $"); #ifndef KERNEL #include *************** *** 90,96 **** #error dunno how to do this machine type, you lose; #endif #endif ! afs_uint32 P_temp; volatile unsigned char *P_temp_p = (unsigned char *)&P_temp; #ifdef BITS16 sbox_out S_out; --- 90,96 ---- #error dunno how to do this machine type, you lose; #endif #endif ! volatile afs_uint32 P_temp; volatile unsigned char *P_temp_p = (unsigned char *)&P_temp; #ifdef BITS16 sbox_out S_out; Index: openafs/src/des/des.h diff -c openafs/src/des/des.h:1.3 openafs/src/des/des.h:1.3.14.1 *** openafs/src/des/des.h:1.3 Tue Jul 15 19:14:59 2003 --- openafs/src/des/des.h Mon Jul 9 15:15:26 2007 *************** *** 20,26 **** --- 20,29 ---- typedef unsigned char des_cblock[8]; /* crypto-block size */ /* Key schedule */ typedef struct des_ks_struct { + union { + afs_uint32 i[2]; des_cblock _; + } _; } des_key_schedule[16]; #define DES_KEY_SZ (sizeof(des_cblock)) Index: openafs/src/des/pcbc_encrypt.c diff -c openafs/src/des/pcbc_encrypt.c:1.10 openafs/src/des/pcbc_encrypt.c:1.10.8.1 *** openafs/src/des/pcbc_encrypt.c:1.10 Tue Oct 5 16:40:59 2004 --- openafs/src/des/pcbc_encrypt.c Mon Jul 9 15:15:26 2007 *************** *** 24,36 **** #ifndef KERNEL #include #endif - #include #include #include #include "des_prototypes.h" RCSID ! ("$Header: /cvs/openafs/src/des/pcbc_encrypt.c,v 1.10 2004/10/05 20:40:59 rees Exp $"); #include "des_internal.h" --- 24,36 ---- #ifndef KERNEL #include #endif #include #include + #include #include "des_prototypes.h" RCSID ! ("$Header: /cvs/openafs/src/des/pcbc_encrypt.c,v 1.10.8.1 2007/07/09 19:15:26 shadow Exp $"); #include "des_internal.h" Index: openafs/src/libafs/MakefileProto.SOLARIS.in diff -c openafs/src/libafs/MakefileProto.SOLARIS.in:1.25.6.2 openafs/src/libafs/MakefileProto.SOLARIS.in:1.25.6.3 *** openafs/src/libafs/MakefileProto.SOLARIS.in:1.25.6.2 Thu Dec 28 17:02:16 2006 --- openafs/src/libafs/MakefileProto.SOLARIS.in Tue Jun 5 13:11:28 2007 *************** *** 33,39 **** KDEFS= -D_KERNEL -DSYSV -dn ${ARCH_DEFS} ! KDEFS_32 = KDEFS_64 = -xarch=v9 --- 33,39 ---- KDEFS= -D_KERNEL -DSYSV -dn ${ARCH_DEFS} ! KDEFS_32 = -xarch=v8 KDEFS_64 = -xarch=v9 Index: openafs/src/libafs/afs.ppc_darwin_70.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.16 openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.17 *** openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.16 Fri May 18 01:22:37 2007 --- openafs/src/libafs/afs.ppc_darwin_70.plist.in Wed Jul 11 00:36:17 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.20 CFBundleSignature ???? CFBundleVersion ! 1.5.20 OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.21 CFBundleSignature ???? CFBundleVersion ! 1.5.21 OSBundleLibraries com.apple.kernel.bsd Index: openafs/src/libafs/afs.ppc_darwin_80.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.16 openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.17 *** openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.16 Fri May 18 01:22:37 2007 --- openafs/src/libafs/afs.ppc_darwin_80.plist.in Wed Jul 11 00:36:17 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.20 CFBundleSignature ???? CFBundleVersion ! 1.5.20 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.21 CFBundleSignature ???? CFBundleVersion ! 1.5.21 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.ppc_darwin_90.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.16 openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.17 *** openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.16 Fri May 18 01:22:37 2007 --- openafs/src/libafs/afs.ppc_darwin_90.plist.in Wed Jul 11 00:36:17 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.20 CFBundleSignature ???? CFBundleVersion ! 1.5.20 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.21 CFBundleSignature ???? CFBundleVersion ! 1.5.21 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.x86_darwin_80.plist.in diff -c openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.16 openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.17 *** openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.16 Fri May 18 01:22:37 2007 --- openafs/src/libafs/afs.x86_darwin_80.plist.in Wed Jul 11 00:36:17 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.20 CFBundleSignature ???? CFBundleVersion ! 1.5.20 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.21 CFBundleSignature ???? CFBundleVersion ! 1.5.21 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.x86_darwin_90.plist.in diff -c openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.16 openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.17 *** openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.16 Fri May 18 01:22:37 2007 --- openafs/src/libafs/afs.x86_darwin_90.plist.in Wed Jul 11 00:36:17 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.20 CFBundleSignature ???? CFBundleVersion ! 1.5.20 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.21 CFBundleSignature ???? CFBundleVersion ! 1.5.21 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/make_kbuild_makefile.pl diff -c openafs/src/libafs/make_kbuild_makefile.pl:1.2.6.3 openafs/src/libafs/make_kbuild_makefile.pl:1.2.6.4 *** openafs/src/libafs/make_kbuild_makefile.pl:1.2.6.3 Mon Jul 31 17:27:41 2006 --- openafs/src/libafs/make_kbuild_makefile.pl Mon Jun 4 23:54:29 2007 *************** *** 82,88 **** foreach (keys %all_objs) { die "No source known for $_\n" unless exists $deps{$_}; if($deps{$_} =~ /\.s$/) { ! ($src = $_) =~ s/\.o$/.s/; } else { ($src = $_) =~ s/\.o$/.c/; } --- 82,88 ---- foreach (keys %all_objs) { die "No source known for $_\n" unless exists $deps{$_}; if($deps{$_} =~ /\.s$/) { ! ($src = $_) =~ s/\.o$/.S/; } else { ($src = $_) =~ s/\.o$/.c/; } Index: openafs/src/lwp/lwp.c diff -c openafs/src/lwp/lwp.c:1.34 openafs/src/lwp/lwp.c:1.34.2.1 *** openafs/src/lwp/lwp.c:1.34 Thu Mar 9 01:34:43 2006 --- openafs/src/lwp/lwp.c Wed Jun 6 13:22:05 2007 *************** *** 17,23 **** #include #include ! RCSID("$Header: /cvs/openafs/src/lwp/lwp.c,v 1.34 2006/03/09 06:34:43 shadow Exp $"); #include #include --- 17,23 ---- #include #include ! RCSID("$Header: /cvs/openafs/src/lwp/lwp.c,v 1.34.2.1 2007/06/06 17:22:05 shadow Exp $"); #include #include *************** *** 33,38 **** --- 33,39 ---- #include #include #pragma alloca + int setlim(int limcon, uchar_t hard, int limit); #endif #ifdef AFS_SGI64_ENV extern char *getenv(); Index: openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB diff -c openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB:1.3.4.2 openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB:1.3.4.3 *** openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB:1.3.4.2 Fri Mar 9 23:55:12 2007 --- openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB Thu Jul 5 19:47:44 2007 *************** *** 1,4 **** ! >grand.central.org #GCO Public CellServDB 09 Mar 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se --- 1,4 ---- ! >grand.central.org #GCO Public CellServDB 05 Jul 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se *************** *** 18,23 **** --- 18,26 ---- 129.27.161.7 #faepafs1.tu-graz.ac.at 129.27.161.15 #faepafs2.tu-graz.ac.at 129.27.161.114 #faepafs3.tu-graz.ac.at + >sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi + 132.216.24.122 #germain.sums.math.mcgill.ca + 132.216.24.125 #turing.sums.math.mcgill.ca >cern.ch #European Laboratory for Particle Physics, Geneva 137.138.128.148 #afsdb1.cern.ch 137.138.246.50 #afsdb3.cern.ch *************** *** 110,115 **** --- 113,120 ---- 141.35.2.180 #afs00.rz.uni-jena.de 141.35.2.181 #afs01.rz.uni-jena.de 141.35.2.182 #afs02.rz.uni-jena.de + >impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst. + 134.95.80.39 #forano.meteo.uni-koeln.de >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology 134.95.144.22 #afs1.meteo.uni-koeln.de 134.95.144.24 #afs2.meteo.uni-koeln.de *************** *** 161,183 **** 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.194.178 #cherry.srv.cs.cmu.edu ! 128.2.194.179 #pumpkin.srv.cs.cmu.edu ! 128.2.194.180 #strawberry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar Campus Cell ! 204.194.25.7 #afs1.qatar.cmu.edu ! 204.194.25.8 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #Cornell Nanoscale Science and Technology Facility 128.253.198.9 #hole.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu --- 166,189 ---- 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.201.46 #strawberry.srv.cs.cmu.edu ! 128.2.201.47 #pumpkin.srv.cs.cmu.edu ! 128.2.201.48 #cherry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar ! 86.36.46.6 #afs1.qatar.cmu.edu ! 86.36.46.7 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #CNF 128.253.198.9 #hole.cnf.cornell.edu + 128.253.198.27 #smoke.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu *************** *** 285,290 **** --- 291,300 ---- 128.174.251.8 #alnitak.acm.uiuc.edu 128.174.251.9 #alnilam.acm.uiuc.edu 128.174.251.10 #mintaka.acm.uiuc.edu + >illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory + 128.174.193.200 #ial.illigal.uiuc.edu + 128.174.193.201 #cac.illigal.uiuc.edu + 128.174.193.202 #gcs.illigal.uiuc.edu >ncsa.uiuc.edu #University of Illinois 141.142.3.5 #congo.ncsa.uiuc.edu 141.142.3.8 #nile.ncsa.uiuc.edu *************** *** 478,486 **** >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 209.234.76.70 #service-3.tproa.net ! 209.234.76.75 #service-4.tproa.net ! 209.234.76.76 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl --- 488,496 ---- >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 72.13.4.23 #service-3.tproa.net ! 72.13.4.24 #service-4.tproa.net ! 72.13.4.25 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl *************** *** 519,526 **** 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se - 130.237.209.39 #ezri.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se --- 529,536 ---- 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se + 130.237.209.5 #afsdb2.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se *************** *** 546,552 **** >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.237.230 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University --- 556,562 ---- >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.234.101 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University Index: openafs/src/packaging/MacOS/CellServDB diff -c openafs/src/packaging/MacOS/CellServDB:1.3.4.2 openafs/src/packaging/MacOS/CellServDB:1.3.4.3 *** openafs/src/packaging/MacOS/CellServDB:1.3.4.2 Fri Mar 9 23:55:12 2007 --- openafs/src/packaging/MacOS/CellServDB Thu Jul 5 19:47:44 2007 *************** *** 1,4 **** ! >grand.central.org #GCO Public CellServDB 09 Mar 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se --- 1,4 ---- ! >grand.central.org #GCO Public CellServDB 05 Jul 2007 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se *************** *** 18,23 **** --- 18,26 ---- 129.27.161.7 #faepafs1.tu-graz.ac.at 129.27.161.15 #faepafs2.tu-graz.ac.at 129.27.161.114 #faepafs3.tu-graz.ac.at + >sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi + 132.216.24.122 #germain.sums.math.mcgill.ca + 132.216.24.125 #turing.sums.math.mcgill.ca >cern.ch #European Laboratory for Particle Physics, Geneva 137.138.128.148 #afsdb1.cern.ch 137.138.246.50 #afsdb3.cern.ch *************** *** 110,115 **** --- 113,120 ---- 141.35.2.180 #afs00.rz.uni-jena.de 141.35.2.181 #afs01.rz.uni-jena.de 141.35.2.182 #afs02.rz.uni-jena.de + >impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst. + 134.95.80.39 #forano.meteo.uni-koeln.de >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology 134.95.144.22 #afs1.meteo.uni-koeln.de 134.95.144.24 #afs2.meteo.uni-koeln.de *************** *** 161,183 **** 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.194.178 #cherry.srv.cs.cmu.edu ! 128.2.194.179 #pumpkin.srv.cs.cmu.edu ! 128.2.194.180 #strawberry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar Campus Cell ! 204.194.25.7 #afs1.qatar.cmu.edu ! 204.194.25.8 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #Cornell Nanoscale Science and Technology Facility 128.253.198.9 #hole.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu --- 166,189 ---- 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. ! 128.2.201.46 #strawberry.srv.cs.cmu.edu ! 128.2.201.47 #pumpkin.srv.cs.cmu.edu ! 128.2.201.48 #cherry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. 128.2.129.7 #porok.ece.cmu.edu 128.2.129.8 #vicio.ece.cmu.edu 128.2.129.9 #e-xing.ece.cmu.edu >scotch.ece.cmu.edu #CMU ECE CALCM research group 128.2.134.82 #lagavulin.ece.cmu.edu ! >qatar.cmu.edu #Carnegie Mellon University - Qatar ! 86.36.46.6 #afs1.qatar.cmu.edu ! 86.36.46.7 #afs2.qatar.cmu.edu >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab 128.2.179.12 #nihao.sbp.ri.cmu.edu 128.2.179.113 #youtheman.sbp.ri.cmu.edu ! >cnf.cornell.edu #CNF 128.253.198.9 #hole.cnf.cornell.edu + 128.253.198.27 #smoke.cnf.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu *************** *** 285,290 **** --- 291,300 ---- 128.174.251.8 #alnitak.acm.uiuc.edu 128.174.251.9 #alnilam.acm.uiuc.edu 128.174.251.10 #mintaka.acm.uiuc.edu + >illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory + 128.174.193.200 #ial.illigal.uiuc.edu + 128.174.193.201 #cac.illigal.uiuc.edu + 128.174.193.202 #gcs.illigal.uiuc.edu >ncsa.uiuc.edu #University of Illinois 141.142.3.5 #congo.ncsa.uiuc.edu 141.142.3.8 #nile.ncsa.uiuc.edu *************** *** 478,486 **** >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 209.234.76.70 #service-3.tproa.net ! 209.234.76.75 #service-4.tproa.net ! 209.234.76.76 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl --- 488,496 ---- >slackers.net #The Slackers' Network 63.201.48.27 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 72.13.4.23 #service-3.tproa.net ! 72.13.4.24 #service-4.tproa.net ! 72.13.4.25 #service-5.tproa.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl *************** *** 519,526 **** 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se - 130.237.209.39 #ezri.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se --- 529,536 ---- 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.202.3 #afsdb1.isk.kth.se + 130.237.209.5 #afsdb2.isk.kth.se 130.237.209.9 #afsdb3.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se *************** *** 546,552 **** >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.237.230 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University --- 556,562 ---- >stacken.kth.se #Stacken Computer Club 130.237.234.3 #milko.stacken.kth.se 130.237.234.43 #hot.stacken.kth.se ! 130.237.234.101 #fishburger.stacken.kth.se >syd.kth.se #Royal Institute of Technology, KTH-Syd 130.237.83.23 #afs.haninge.kth.se >physto.se #Physics department Stockholm University Index: openafs/src/packaging/MacOS/OpenAFS.Info.plist diff -c openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.17 openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.18 *** openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.17 Fri May 18 01:22:39 2007 --- openafs/src/packaging/MacOS/OpenAFS.Info.plist Wed Jul 11 00:36:19 2007 *************** *** 3,15 **** CFBundleGetInfoString ! OpenAFS 1.5.20 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.5.20 IFMajorVersion 1 IFMinorVersion --- 3,15 ---- CFBundleGetInfoString ! OpenAFS 1.5.21 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.5.21 IFMajorVersion 1 IFMinorVersion Index: openafs/src/packaging/MacOS/OpenAFS.info diff -c openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.16 openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.17 *** openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.16 Fri May 18 01:22:39 2007 --- openafs/src/packaging/MacOS/OpenAFS.info Wed Jul 11 00:36:19 2007 *************** *** 1,5 **** Title OpenAFS ! Version 1.5.20 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) --- 1,5 ---- Title OpenAFS ! Version 1.5.21 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) Index: openafs/src/packaging/MacOS/buildpkg.sh diff -c openafs/src/packaging/MacOS/buildpkg.sh:1.13.2.9 openafs/src/packaging/MacOS/buildpkg.sh:1.13.2.10 *** openafs/src/packaging/MacOS/buildpkg.sh:1.13.2.9 Fri Jan 5 18:31:30 2007 --- openafs/src/packaging/MacOS/buildpkg.sh Tue Jul 3 10:02:54 2007 *************** *** 122,128 **** --- 122,132 ---- else echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample fi + if [ $majorvers -ge 9 ]; then echo '-memcache -afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample + else + echo '-afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample + fi strip -X -S $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs Index: openafs/src/procmgmt/procmgmt_nt.c diff -c openafs/src/procmgmt/procmgmt_nt.c:1.7.4.1 openafs/src/procmgmt/procmgmt_nt.c:1.7.4.2 *** openafs/src/procmgmt/procmgmt_nt.c:1.7.4.1 Tue Jan 30 07:07:18 2007 --- openafs/src/procmgmt/procmgmt_nt.c Fri Jun 29 19:52:54 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/procmgmt/procmgmt_nt.c,v 1.7.4.1 2007/01/30 12:07:18 jaltman Exp $"); #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/procmgmt/procmgmt_nt.c,v 1.7.4.2 2007/06/29 23:52:54 jaltman Exp $"); #include *************** *** 251,256 **** --- 251,257 ---- RemoteSignalListenerThread(LPVOID param) { HANDLE sigPipeHandle = (HANDLE) param; + HMODULE hLib = LoadLibrary("AFSPROCMGMT.DLL"); while (1) { /* wait for pipe client to connect */ *************** *** 296,301 **** --- 297,303 ---- } /* never reached */ + FreeLibrary(hLib); return (0); } Index: openafs/src/rx/rx_lwp.c diff -c openafs/src/rx/rx_lwp.c:1.19 openafs/src/rx/rx_lwp.c:1.19.4.1 *** openafs/src/rx/rx_lwp.c:1.19 Sat Nov 5 01:48:18 2005 --- openafs/src/rx/rx_lwp.c Thu Jun 14 15:06:25 2007 *************** *** 22,28 **** #include RCSID ! ("$Header: /cvs/openafs/src/rx/rx_lwp.c,v 1.19 2005/11/05 06:48:18 jaltman Exp $"); # include /* fd_set on older platforms */ # include --- 22,28 ---- #include RCSID ! ("$Header: /cvs/openafs/src/rx/rx_lwp.c,v 1.19.4.1 2007/06/14 19:06:25 jaltman Exp $"); # include /* fd_set on older platforms */ # include *************** *** 445,456 **** if (!(sfds = IOMGR_AllocFDSet())) { (osi_Msg "rx failed to alloc fd_set: "); perror("rx_sendmsg"); ! return 3; } FD_SET(socket, sfds); } #ifdef AFS_NT40_ENV ! if (errno) #elif defined(AFS_LINUX22_ENV) /* linux unfortunately returns ECONNREFUSED if the target port * is no longer in use */ --- 445,456 ---- if (!(sfds = IOMGR_AllocFDSet())) { (osi_Msg "rx failed to alloc fd_set: "); perror("rx_sendmsg"); ! return -1; } FD_SET(socket, sfds); } #ifdef AFS_NT40_ENV ! if (WSAGetLastError()) #elif defined(AFS_LINUX22_ENV) /* linux unfortunately returns ECONNREFUSED if the target port * is no longer in use */ *************** *** 463,469 **** { (osi_Msg "rx failed to send packet: "); perror("rx_sendmsg"); ! return 3; } while ((err = select(socket + 1, 0, sfds, 0, 0)) != 1) { if (err >= 0 || errno != EINTR) --- 463,469 ---- { (osi_Msg "rx failed to send packet: "); perror("rx_sendmsg"); ! return -1; } while ((err = select(socket + 1, 0, sfds, 0, 0)) != 1) { if (err >= 0 || errno != EINTR) Index: openafs/src/rx/rx_packet.c diff -c openafs/src/rx/rx_packet.c:1.62.2.6 openafs/src/rx/rx_packet.c:1.62.2.9 *** openafs/src/rx/rx_packet.c:1.62.2.6 Thu Jan 11 22:49:56 2007 --- openafs/src/rx/rx_packet.c Sat Jun 23 02:23:12 2007 *************** *** 15,21 **** #endif RCSID ! ("$Header: /cvs/openafs/src/rx/rx_packet.c,v 1.62.2.6 2007/01/12 03:49:56 shadow Exp $"); #ifdef KERNEL #if defined(UKERNEL) --- 15,21 ---- #endif RCSID ! ("$Header: /cvs/openafs/src/rx/rx_packet.c,v 1.62.2.9 2007/06/23 06:23:12 shadow Exp $"); #ifdef KERNEL #if defined(UKERNEL) *************** *** 2226,2250 **** p->retryTime = p->timeSent; /* resend it very soon */ clock_Addmsec(&(p->retryTime), 10 + (((afs_uint32) p->backoff) << 8)); ! ! #ifdef AFS_NT40_ENV ! /* Windows is nice -- it can tell us right away that we cannot ! * reach this recipient by returning an WSAEHOSTUNREACH error ! * code. So, when this happens let's "down" the host NOW so * we don't sit around waiting for this host to timeout later. */ ! if (call && code == -1 && errno == WSAEHOSTUNREACH) ! call->lastReceiveTime = 0; #endif ! #if defined(KERNEL) && defined(AFS_LINUX20_ENV) ! /* Linux is nice -- it can tell us right away that we cannot ! * reach this recipient by returning an ENETUNREACH error ! * code. So, when this happens let's "down" the host NOW so ! * we don't sit around waiting for this host to timeout later. ! */ ! if (call && code == -ENETUNREACH) call->lastReceiveTime = 0; - #endif } #ifdef KERNEL #ifdef RX_KERNEL_TRACE --- 2226,2248 ---- p->retryTime = p->timeSent; /* resend it very soon */ clock_Addmsec(&(p->retryTime), 10 + (((afs_uint32) p->backoff) << 8)); ! /* Some systems are nice and tell us right away that we cannot ! * reach this recipient by returning an error code. ! * So, when this happens let's "down" the host NOW so * we don't sit around waiting for this host to timeout later. */ ! if (call && ! #ifdef AFS_NT40_ENV ! code == -1 && WSAGetLastError() == WSAEHOSTUNREACH ! #elif defined(AFS_LINUX20_ENV) && defined(KERNEL) ! code == -ENETUNREACH ! #elif defined(AFS_DARWIN_ENV) && defined(KERNEL) ! code == EHOSTUNREACH ! #else ! 0 #endif ! ) call->lastReceiveTime = 0; } #ifdef KERNEL #ifdef RX_KERNEL_TRACE *************** *** 2420,2443 **** clock_Addmsec(&(p->retryTime), 10 + (((afs_uint32) p->backoff) << 8)); } ! #ifdef AFS_NT40_ENV ! /* Windows is nice -- it can tell us right away that we cannot ! * reach this recipient by returning an WSAEHOSTUNREACH error ! * code. So, when this happens let's "down" the host NOW so * we don't sit around waiting for this host to timeout later. */ ! if (call && code == -1 && errno == WSAEHOSTUNREACH) ! call->lastReceiveTime = 0; #endif ! #if defined(KERNEL) && defined(AFS_LINUX20_ENV) ! /* Linux is nice -- it can tell us right away that we cannot ! * reach this recipient by returning an ENETUNREACH error ! * code. So, when this happens let's "down" the host NOW so ! * we don't sit around waiting for this host to timeout later. ! */ ! if (call && code == -ENETUNREACH) call->lastReceiveTime = 0; - #endif } #if defined(AFS_SUN5_ENV) && defined(KERNEL) if (!istack && waslocked) --- 2418,2440 ---- clock_Addmsec(&(p->retryTime), 10 + (((afs_uint32) p->backoff) << 8)); } ! /* Some systems are nice and tell us right away that we cannot ! * reach this recipient by returning an error code. ! * So, when this happens let's "down" the host NOW so * we don't sit around waiting for this host to timeout later. */ ! if (call && ! #ifdef AFS_NT40_ENV ! code == -1 && WSAGetLastError() == WSAEHOSTUNREACH ! #elif defined(AFS_LINUX20_ENV) && defined(KERNEL) ! code == -ENETUNREACH ! #elif defined(AFS_DARWIN_ENV) && defined(KERNEL) ! code == EHOSTUNREACH ! #else ! 0 #endif ! ) call->lastReceiveTime = 0; } #if defined(AFS_SUN5_ENV) && defined(KERNEL) if (!istack && waslocked) Index: openafs/src/rx/LINUX/rx_kmutex.c diff -c openafs/src/rx/LINUX/rx_kmutex.c:1.13.2.1 openafs/src/rx/LINUX/rx_kmutex.c:1.13.2.2 *** openafs/src/rx/LINUX/rx_kmutex.c:1.13.2.1 Thu Dec 28 16:30:28 2006 --- openafs/src/rx/LINUX/rx_kmutex.c Tue Jun 12 01:44:05 2007 *************** *** 17,23 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/LINUX/rx_kmutex.c,v 1.13.2.1 2006/12/28 21:30:28 shadow Exp $"); #include "rx/rx_kcommon.h" #include "rx_kmutex.h" --- 17,23 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/LINUX/rx_kmutex.c,v 1.13.2.2 2007/06/12 05:44:05 rra Exp $"); #include "rx/rx_kcommon.h" #include "rx_kmutex.h" *************** *** 122,128 **** --- 122,132 ---- #if defined(STRUCT_TASK_STRUCT_HAS_TODO) !current->todo #else + #if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO) test_ti_thread_flag(current->thread_info, TIF_FREEZE) + #else + test_ti_thread_flag(task_thread_info(current), TIF_FREEZE) + #endif #endif #endif ) Index: openafs/src/rx/LINUX/rx_knet.c diff -c openafs/src/rx/LINUX/rx_knet.c:1.32.2.4 openafs/src/rx/LINUX/rx_knet.c:1.32.2.5 *** openafs/src/rx/LINUX/rx_knet.c:1.32.2.4 Tue Mar 20 14:47:23 2007 --- openafs/src/rx/LINUX/rx_knet.c Tue Jun 12 01:44:05 2007 *************** *** 16,22 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/LINUX/rx_knet.c,v 1.32.2.4 2007/03/20 18:47:23 shadow Exp $"); #include #ifdef AFS_LINUX22_ENV --- 16,22 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/LINUX/rx_knet.c,v 1.32.2.5 2007/06/12 05:44:05 rra Exp $"); #include #ifdef AFS_LINUX22_ENV *************** *** 173,179 **** --- 173,183 ---- #if defined(STRUCT_TASK_STRUCT_HAS_TODO) !current->todo #else + #if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO) test_ti_thread_flag(current->thread_info, TIF_FREEZE) + #else + test_ti_thread_flag(task_thread_info(current), TIF_FREEZE) + #endif #endif #endif ) Index: openafs/src/rxkad/rxkad_server.c diff -c openafs/src/rxkad/rxkad_server.c:1.21.2.2 openafs/src/rxkad/rxkad_server.c:1.21.2.3 *** openafs/src/rxkad/rxkad_server.c:1.21.2.2 Sat Nov 4 18:55:22 2006 --- openafs/src/rxkad/rxkad_server.c Sun Jun 10 10:25:29 2007 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/rxkad/rxkad_server.c,v 1.21.2.2 2006/11/04 23:55:22 jaltman Exp $"); #include #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/rxkad/rxkad_server.c,v 1.21.2.3 2007/06/10 14:25:29 jaltman Exp $"); #include #include *************** *** 361,368 **** return RXKADEXPIRED; else if (code < -1) return RXKADBADTICKET; - else if (code <= 0) - return RXKADBADTICKET; code = fc_keysched(&sessionkey, sconn->keysched); if (code) --- 361,366 ---- Index: openafs/src/sys/pagsh.c diff -c openafs/src/sys/pagsh.c:1.9.14.1 openafs/src/sys/pagsh.c:1.9.14.2 *** openafs/src/sys/pagsh.c:1.9.14.1 Wed Jul 19 17:17:18 2006 --- openafs/src/sys/pagsh.c Tue Jul 10 16:29:34 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/sys/pagsh.c,v 1.9.14.1 2006/07/19 21:17:18 shadow Exp $"); #ifdef AFS_AIX32_ENV #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/sys/pagsh.c,v 1.9.14.2 2007/07/10 20:29:34 shadow Exp $"); #ifdef AFS_AIX32_ENV #include *************** *** 127,144 **** --- 127,148 ---- afs_uint32 pag; struct stat sbuf; char fname[256], *prefix = "/ticket/"; + char fname5[256], *prefix5 = "FILE:/ticket/krb5cc_"; int numenv; char **newenv, **senv, **denv; if (stat("/ticket", &sbuf) == -1) { prefix = "/tmp/tkt"; + prefix5 = "FILE:/tmp/krb5cc_"; } pag = curpag() & 0xffffffff; if (pag == -1) { sprintf(fname, "%s%d", prefix, getuid()); + sprintf(fname5, "%s%d", prefix5, getuid()); } else { sprintf(fname, "%sp%ld", prefix, pag); + sprintf(fname5, "%sp%ld", prefix5, pag); } /* ktc_set_tkt_string(fname); */ *************** *** 147,159 **** newenv = (char **)malloc((numenv + 2) * sizeof(char *)); for (senv = environ, denv = newenv; *senv; *senv++) { ! if (strncmp(*senv, "KRBTKFILE=", 10) != 0) *denv++ = *senv; } ! *denv = malloc(10 + strlen(fname) + 1); strcpy(*denv, "KRBTKFILE="); strcat(*denv, fname); *++denv = 0; environ = newenv; } --- 151,168 ---- newenv = (char **)malloc((numenv + 2) * sizeof(char *)); for (senv = environ, denv = newenv; *senv; *senv++) { ! if (strncmp(*senv, "KRBTKFILE=", 10) != 0 && ! strncmp(*senv, "KRB5CCNAME=", 11) != 0) *denv++ = *senv; } ! *denv = malloc(10+11 + strlen(fname) + strlen(fname5) + 2); strcpy(*denv, "KRBTKFILE="); strcat(*denv, fname); + *(denv+1) = *denv + strlen(*denv) + 1; + denv++; + strcpy(*denv, "KRB5CCNAME="); + strcat(*denv, fname5); *++denv = 0; environ = newenv; } Index: openafs/src/sys/pioctl_nt.c diff -c openafs/src/sys/pioctl_nt.c:1.34.4.3 openafs/src/sys/pioctl_nt.c:1.34.4.6 *** openafs/src/sys/pioctl_nt.c:1.34.4.3 Mon Aug 28 13:18:36 2006 --- openafs/src/sys/pioctl_nt.c Wed Jun 27 23:40:14 2007 *************** *** 35,41 **** #include RCSID ! ("$Header: /cvs/openafs/src/sys/pioctl_nt.c,v 1.34.4.3 2006/08/28 17:18:36 jaltman Exp $"); #include #include --- 35,41 ---- #include RCSID ! ("$Header: /cvs/openafs/src/sys/pioctl_nt.c,v 1.34.4.6 2007/06/28 03:40:14 jaltman Exp $"); #include #include *************** *** 54,59 **** --- 54,60 ---- #include #include + #include #include #include #include *************** *** 90,95 **** --- 91,97 ---- case CM_ERROR_NOACCESS: return EACCES; case CM_ERROR_NOSUCHFILE: + case CM_ERROR_NOSUCHPATH: return ENOENT; case CM_ERROR_INVAL: return EINVAL; *************** *** 115,120 **** --- 117,128 ---- return EDOM; /* hack */ case CM_ERROR_TOOMANYBUFS: return EFBIG; /* hack */ + case CM_ERROR_ALLBUSY: + return EBUSY; + case CM_ERROR_ALLDOWN: + return ENOSYS; /* hack */ + case CM_ERROR_ALLOFFLINE: + return ENXIO; /* hack */ default: if (cm_code > 0 && cm_code < EILSEQ) return cm_code; *************** *** 991,996 **** --- 999,1008 ---- MarshallString(&preq, fullPath); if (blobp->in_size) { + if (blobp->in_size > sizeof(preq.data) - (preq.mp - preq.data)*sizeof(char)) { + errno = E2BIG; + return -1; + } memcpy(preq.mp, blobp->in, blobp->in_size); preq.mp += blobp->in_size; } Index: openafs/src/venus/fs.c diff -c openafs/src/venus/fs.c:1.30.2.8 openafs/src/venus/fs.c:1.30.2.9 *** openafs/src/venus/fs.c:1.30.2.8 Tue Apr 10 14:39:56 2007 --- openafs/src/venus/fs.c Tue Jun 12 15:14:12 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/venus/fs.c,v 1.30.2.8 2007/04/10 18:39:56 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/venus/fs.c,v 1.30.2.9 2007/06/12 19:14:12 shadow Exp $"); #include #include *************** *** 69,75 **** static struct ubik_client *uclient; static int GetClientAddrsCmd(), SetClientAddrsCmd(), FlushMountCmd(); ! static int RxStatProcCmd(), RxStatPeerCmd(), GetFidCmd(); extern char *hostutil_GetNameByINet(); extern struct hostent *hostutil_GetHostByName(); --- 69,75 ---- static struct ubik_client *uclient; static int GetClientAddrsCmd(), SetClientAddrsCmd(), FlushMountCmd(); ! static int RxStatProcCmd(), RxStatPeerCmd(), GetFidCmd(), NewUuidCmd(); extern char *hostutil_GetNameByINet(); extern struct hostent *hostutil_GetHostByName(); *************** *** 1245,1250 **** --- 1245,1268 ---- } static int + NewUuidCmd(struct cmd_syndesc *as, char *arock) + { + afs_int32 code; + struct ViceIoctl blob; + + blob.in_size = 0; + blob.out_size = 0; + code = pioctl(0, VIOC_NEWUUID, &blob, 1); + if (code) { + Die(errno, 0); + return 1; + } + + printf("New uuid generated.\n"); + return 0; + } + + static int FlushCmd(struct cmd_syndesc *as, char *arock) { afs_int32 code; *************** *** 3620,3625 **** --- 3638,3646 ---- ts = cmd_CreateSyntax("nukenfscreds", NukeNFSCredsCmd, 0, "nuke credentials for NFS client"); cmd_AddParm(ts, "-addr", CMD_SINGLE, 0, "host name or address"); + ts = cmd_CreateSyntax("newuuid", NewUuidCmd, 0, + "force a new uuid"); + code = cmd_Dispatch(argc, argv); if (rxInitDone) rx_Finalize(); Index: openafs/src/vol/clone.c diff -c openafs/src/vol/clone.c:1.25 openafs/src/vol/clone.c:1.19.2.6 *** openafs/src/vol/clone.c:1.25 Fri May 18 01:52:37 2007 --- openafs/src/vol/clone.c Fri May 18 01:53:56 2007 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/clone.c,v 1.25 2007/05/18 05:52:37 shadow Exp $"); #include #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/clone.c,v 1.19.2.6 2007/05/18 05:53:56 shadow Exp $"); #include #include Index: openafs/src/volser/volmain.c diff -c openafs/src/volser/volmain.c:1.22.2.5 openafs/src/volser/volmain.c:1.22.2.6 *** openafs/src/volser/volmain.c:1.22.2.5 Thu Feb 8 20:00:23 2007 --- openafs/src/volser/volmain.c Wed Jun 27 22:12:24 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/volmain.c,v 1.22.2.5 2007/02/09 01:00:23 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/volmain.c,v 1.22.2.6 2007/06/28 02:12:24 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 421,426 **** --- 421,430 ---- exit(1); } #endif + /* Open VolserLog and map stdout, stderr into it; VInitVolumePackage can + log, so we need to do this here */ + OpenLog(AFSDIR_SERVER_VOLSERLOG_FILEPATH); + VInitVolumePackage(volumeUtility, 0, 0, CONNECT_FS, 0); /* For nuke() */ Lock_Init(&localLock); *************** *** 470,477 **** rx_SetRxDeadTime(420); memset(busyFlags, 0, sizeof(busyFlags)); - /* Open FileLog and map stdout, stderr into it */ - OpenLog(AFSDIR_SERVER_VOLSERLOG_FILEPATH); SetupLogSignals(); { --- 474,479 ---- Index: openafs/src/volser/vsprocs.c diff -c openafs/src/volser/vsprocs.c:1.38.2.2 openafs/src/volser/vsprocs.c:1.38.2.4 *** openafs/src/volser/vsprocs.c:1.38.2.2 Tue Apr 10 14:39:56 2007 --- openafs/src/volser/vsprocs.c Mon Jul 2 13:08:03 2007 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/vsprocs.c,v 1.38.2.2 2007/04/10 18:39:56 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/vsprocs.c,v 1.38.2.4 2007/07/02 17:08:03 jaltman Exp $"); #include #include *************** *** 2479,2485 **** VPRINT1("Recovery: Creating transaction on clone volume %u ...", cloneVol); code = ! AFSVolTransCreate(fromconn, newVol, afrompart, ITOffline, &clonetid); if (!code) { VDONE; --- 2479,2485 ---- VPRINT1("Recovery: Creating transaction on clone volume %u ...", cloneVol); code = ! AFSVolTransCreate(fromconn, cloneVol, afrompart, ITOffline, &clonetid); if (!code) { VDONE; *************** *** 4383,4391 **** same = VLDB_IsSameAddrs(toserver, entry.serverNumber[index], &errcode); ! EPRINT2(errcode, ! "Failed to get info about server's %d address(es) from vlserver (err=%d)\n", ! toserver, errcode); if ((!errcode && !same) || (entry.serverPartition[index] != topart)) { tempconn = --- 4383,4392 ---- same = VLDB_IsSameAddrs(toserver, entry.serverNumber[index], &errcode); ! if (errcode) ! EPRINT2(errcode, ! "Failed to get info about server's %d address(es) from vlserver (err=%d)\n", ! toserver, errcode); if ((!errcode && !same) || (entry.serverPartition[index] != topart)) { tempconn =