}
/* called with cm_scacheLock and scp write-locked */
-void cm_ResetSCacheDirectory(cm_scache_t *scp)
+void cm_ResetSCacheDirectory(cm_scache_t *scp, afs_int32 dirlock)
{
#ifdef USE_BPLUS
/* destroy directory Bplus Tree */
if (scp->dirBplus) {
LARGE_INTEGER start, end;
+
+ if (!dirlock && !lock_TryWrite(&scp->dirlock)) {
+ /*
+ * We are not holding the dirlock and obtaining it
+ * requires that we drop the scp->rw. As a result
+ * we will leave the dirBplus tree intact but
+ * invalidate the version number so that whatever
+ * operation is currently active can safely complete
+ * but the contents will be ignored on the next
+ * directory operation.
+ */
+ scp->dirDataVersion = CM_SCACHE_VERSION_BAD;
+ return;
+ }
+
QueryPerformanceCounter(&start);
bplus_free_tree++;
freeBtree(scp->dirBplus);
scp->dirBplus = NULL;
+ scp->dirDataVersion = CM_SCACHE_VERSION_BAD;
QueryPerformanceCounter(&end);
+
+ if (!dirlock)
+ lock_ReleaseWrite(&scp->dirlock);
bplus_free_time += (end.QuadPart - start.QuadPart);
}
bufp->dirty_length = 0;
bufp->flags |= CM_BUF_ERROR;
bufp->error = VNOVNODE;
- bufp->dataVersion = -1; /* bad */
+ bufp->dataVersion = CM_BUF_VERSION_BAD; /* bad */
bufp->dirtyCounter++;
if (bufp->flags & CM_BUF_WAITING) {
osi_Log2(afsd_logp, "CM RecycleSCache Waking [scp 0x%x] bufp 0x%x", scp, bufp);
bufp->dirty_length = 0;
bufp->flags |= CM_BUF_ERROR;
bufp->error = VNOVNODE;
- bufp->dataVersion = -1; /* bad */
+ bufp->dataVersion = CM_BUF_VERSION_BAD; /* bad */
bufp->dirtyCounter++;
if (bufp->flags & CM_BUF_WAITING) {
osi_Log2(afsd_logp, "CM RecycleSCache Waking [scp 0x%x] bufp 0x%x", scp, bufp);
| CM_SCACHEFLAG_OUTOFSPACE
| CM_SCACHEFLAG_EACCESS);
scp->serverModTime = 0;
- scp->dataVersion = 0;
- scp->bufDataVersionLow = 0;
+ scp->dataVersion = CM_SCACHE_VERSION_BAD;
+ scp->bufDataVersionLow = CM_SCACHE_VERSION_BAD;
scp->bulkStatProgress = hzero;
scp->waitCount = 0;
scp->waitQueueT = NULL;
scp->cbServerp = NULL;
}
scp->cbExpires = 0;
+ scp->volumeCreationDate = 0;
scp->fid.vnode = 0;
scp->fid.volume = 0;
scp->serverLock = (-1);
scp->exclusiveLocks = 0;
scp->sharedLocks = 0;
- scp->lockDataVersion = -1;
+ scp->lockDataVersion = CM_SCACHE_VERSION_BAD;
+ scp->fsLockCount = 0;
/* not locked, but there can be no references to this guy
* while we hold the global refcount lock.
*/
cm_FreeAllACLEnts(scp);
- cm_ResetSCacheDirectory(scp);
+ cm_ResetSCacheDirectory(scp, 0);
return 0;
}
{
if ( newFile ) {
memset(&cm_data.fakeSCache, 0, sizeof(cm_scache_t));
+ cm_data.fakeSCache.magic = CM_SCACHE_MAGIC;
cm_data.fakeSCache.cbServerp = (struct cm_server *)(-1);
+ cm_data.fakeSCache.cbExpires = (time_t)-1;
/* can leave clientModTime at 0 */
cm_data.fakeSCache.fileType = CM_SCACHETYPE_FILE;
cm_data.fakeSCache.unixModeBits = 0777;
cm_data.fakeSCache.length.LowPart = 1000;
cm_data.fakeSCache.linkCount = 1;
cm_data.fakeSCache.refCount = 1;
+ cm_data.fakeSCache.serverLock = -1;
+ cm_data.fakeSCache.dataVersion = CM_SCACHE_VERSION_BAD;
}
lock_InitializeRWLock(&cm_data.fakeSCache.rw, "cm_scache_t rw", LOCK_HIERARCHY_SCACHE);
+ lock_InitializeRWLock(&cm_data.fakeSCache.bufCreateLock, "cm_scache_t bufCreateLock", LOCK_HIERARCHY_SCACHE_BUFCREATE);
+ lock_InitializeRWLock(&cm_data.fakeSCache.dirlock, "cm_scache_t dirlock", LOCK_HIERARCHY_SCACHE_DIRLOCK);
}
long
if (scp->dirBplus)
freeBtree(scp->dirBplus);
scp->dirBplus = NULL;
- scp->dirDataVersion = -1;
+ scp->dirDataVersion = CM_SCACHE_VERSION_BAD;
lock_FinalizeRWLock(&scp->dirlock);
#endif
lock_FinalizeRWLock(&scp->rw);
#endif
scp->cbServerp = NULL;
scp->cbExpires = 0;
+ scp->volumeCreationDate = 0;
scp->fileLocksH = NULL;
scp->fileLocksT = NULL;
scp->serverLock = (-1);
scp->waitCount = 0;
#ifdef USE_BPLUS
scp->dirBplus = NULL;
- scp->dirDataVersion = -1;
+ scp->dirDataVersion = CM_SCACHE_VERSION_BAD;
#endif
scp->waitQueueT = NULL;
scp->flags &= ~CM_SCACHEFLAG_WAITING;
hash = CM_SCACHE_HASH(fidp);
- osi_assertx(fidp->cell != 0, "unassigned cell value");
+ if (fidp->cell == 0)
+ return CM_ERROR_INVAL;
#ifdef AFS_FREELANCE_CLIENT
special = (fidp->cell==AFS_FAKE_ROOT_CELL_ID &&
}
if (cm_freelanceEnabled && special) {
- char mp[MOUNTPOINTLEN] = "";
- afs_uint32 fileType;
-
lock_ReleaseWrite(&cm_scacheLock);
osi_Log0(afsd_logp,"cm_GetSCache Freelance and special");
cm_reInitLocalMountPoints(); // start reinit
}
- lock_ObtainMutex(&cm_Freelance_Lock);
- if (fidp->vnode >= 2 && fidp->vnode - 2 < cm_noLocalMountPoints) {
- strncpy(mp,(cm_localMountPoints+fidp->vnode-2)->mountPointStringp, MOUNTPOINTLEN);
- mp[MOUNTPOINTLEN-1] = '\0';
- if ( !strnicmp(mp, "msdfs:", strlen("msdfs:")) )
- fileType = CM_SCACHETYPE_DFSLINK;
- else
- fileType = (cm_localMountPoints+fidp->vnode-2)->fileType;
- } else {
- fileType = CM_SCACHETYPE_INVALID;
-
- }
- lock_ReleaseMutex(&cm_Freelance_Lock);
lock_ObtainWrite(&cm_scacheLock);
if (scp == NULL) {
scp = cm_GetNewSCache(); /* returns scp->rw held */
}
scp->refCount = 1;
osi_Log1(afsd_logp,"cm_GetSCache (freelance) sets refCount to 1 scp 0x%x", scp);
- scp->fileType = fileType;
- scp->length.LowPart = (DWORD)strlen(mp)+4;
+
+ /* must be called after the scp->fid is set */
+ cm_FreelanceFetchMountPointString(scp);
+ cm_FreelanceFetchFileType(scp);
+
+ scp->length.LowPart = (DWORD)strlen(scp->mountPointStringp)+4;
scp->length.HighPart = 0;
- strncpy(scp->mountPointStringp,mp,MOUNTPOINTLEN);
scp->owner=0x0;
scp->unixModeBits=0777;
scp->clientModTime=FakeFreelanceModTime;
scp->group=0;
scp->dataVersion=cm_data.fakeDirVersion;
scp->bufDataVersionLow=cm_data.fakeDirVersion;
- scp->lockDataVersion=-1; /* no lock yet */
+ scp->lockDataVersion=CM_SCACHE_VERSION_BAD; /* no lock yet */
+ scp->fsLockCount=0;
lock_ReleaseWrite(&scp->rw);
lock_ReleaseWrite(&cm_scacheLock);
*outScpp = scp;
lock_ObtainWrite(&scp->rw);
} while (!cm_SyncOpCheckContinue(scp, flags, bufp));
- smb_UpdateServerPriority();
+ cm_UpdateServerPriority();
scp->waitCount--;
osi_Log3(afsd_logp, "CM SyncOp woke! scp 0x%p; still waiting %d threads of %d requests",
void cm_MergeStatus(cm_scache_t *dscp,
cm_scache_t *scp, AFSFetchStatus *statusp,
AFSVolSync *volsyncp,
- cm_user_t *userp, afs_uint32 flags)
+ cm_user_t *userp, cm_req_t *reqp, afs_uint32 flags)
{
afs_uint64 dataVersion;
// yj: i want to create some fake status for the /afs directory and the
// entries under that directory
#ifdef AFS_FREELANCE_CLIENT
- if (cm_freelanceEnabled && scp == cm_data.rootSCachep) {
- osi_Log0(afsd_logp,"cm_MergeStatus Freelance cm_data.rootSCachep");
+ if (cm_freelanceEnabled && scp->fid.cell==AFS_FAKE_ROOT_CELL_ID &&
+ scp->fid.volume==AFS_FAKE_ROOT_VOL_ID) {
+ if (scp == cm_data.rootSCachep) {
+ osi_Log0(afsd_logp,"cm_MergeStatus Freelance cm_data.rootSCachep");
+ statusp->FileType = CM_SCACHETYPE_DIRECTORY;
+ statusp->Length = cm_fakeDirSize;
+ statusp->Length_hi = 0;
+ } else {
+ statusp->FileType = scp->fileType;
+ statusp->Length = scp->length.LowPart;
+ statusp->Length_hi = scp->length.HighPart;
+ }
statusp->InterfaceVersion = 0x1;
- statusp->FileType = CM_SCACHETYPE_DIRECTORY;
statusp->LinkCount = scp->linkCount;
- statusp->Length = cm_fakeDirSize;
- statusp->Length_hi = 0;
statusp->DataVersion = (afs_uint32)(cm_data.fakeDirVersion & 0xFFFFFFFF);
statusp->Author = 0x1;
statusp->Owner = 0x0;
statusp->Group = 0;
statusp->SyncCounter = 0;
statusp->dataVersionHigh = (afs_uint32)(cm_data.fakeDirVersion >> 32);
+ statusp->lockCount = 0;
statusp->errorCode = 0;
}
#endif /* AFS_FREELANCE_CLIENT */
scp->group = 0;
scp->unixModeBits = 0;
scp->anyAccess = 0;
- scp->dataVersion = 0;
- scp->bufDataVersionLow = 0;
+ scp->dataVersion = CM_SCACHE_VERSION_BAD;
+ scp->bufDataVersionLow = CM_SCACHE_VERSION_BAD;
+ scp->fsLockCount = 0;
if (dscp) {
scp->parentVnode = dscp->fid.vnode;
dataVersion <<= 32;
dataVersion |= statusp->DataVersion;
- if (!(flags & CM_MERGEFLAG_FORCE) && dataVersion < scp->dataVersion) {
+ if (!(flags & CM_MERGEFLAG_FORCE) &&
+ dataVersion < scp->dataVersion &&
+ scp->dataVersion != CM_SCACHE_VERSION_BAD) {
struct cm_cell *cellp;
cellp = cm_FindCellByID(scp->fid.cell, 0);
if (scp->cbServerp) {
struct cm_volume *volp = NULL;
-
cm_FindVolumeByID(cellp, scp->fid.volume, userp,
- (cm_req_t *) NULL, CM_GETVOL_FLAG_CREATE, &volp);
+ reqp, 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)");
return;
}
+ scp->volumeCreationDate = volsyncp->spare1; /* volume creation date */
+
scp->serverModTime = statusp->ServerModTime;
if (!(scp->mask & CM_SCACHEMASK_CLIENTMODTIME)) {
/* and other stuff */
scp->parentVnode = statusp->ParentVnode;
scp->parentUnique = statusp->ParentUnique;
-
+ scp->fsLockCount = statusp->lockCount;
+
/* and merge in the private acl cache info, if this is more than the public
* info; merge in the public stuff in any case.
*/
scp->cbServerp = NULL;
}
scp->cbExpires = 0;
- scp->flags &= ~CM_SCACHEFLAG_CALLBACK;
+ scp->flags &= ~(CM_SCACHEFLAG_CALLBACK | CM_SCACHEFLAG_LOCAL);
cm_dnlcPurgedp(scp);
cm_dnlcPurgevp(scp);
cm_FreeAllACLEnts(scp);
for (scp = cm_data.allSCachesp; scp; scp = scp->allNextp)
{
- sprintf(output, "%s scp=0x%p, fid (cell=%d, volume=%d, vnode=%d, unique=%d) type=%d dv=%I64d len=0x%I64x mp='%s' Locks (server=0x%x shared=%d excl=%d clnt=%d) 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->fileType, scp->dataVersion, scp->length.QuadPart, scp->mountPointStringp,
- scp->serverLock, scp->sharedLocks, scp->exclusiveLocks, scp->clientLocks,
- scp->flags, (unsigned long)scp->cbExpires, scp->refCount);
+ time_t t;
+ char *srvStr = NULL;
+ afs_uint32 srvStrRpc = TRUE;
+ char *cbt = NULL;
+ char *cdrot = NULL;
+
+ if (scp->cbServerp) {
+ if (!((scp->cbServerp->flags & CM_SERVERFLAG_UUID) &&
+ UuidToString((UUID *)&scp->cbServerp->uuid, &srvStr) == RPC_S_OK)) {
+ afs_asprintf(&srvStr, "%.0I", scp->cbServerp->addr.sin_addr.s_addr);
+ srvStrRpc = FALSE;
+ }
+ }
+ if (scp->cbExpires) {
+ t = scp->cbExpires;
+ cbt = ctime(&t);
+ if (cbt) {
+ cbt = strdup(cbt);
+ cbt[strlen(cbt)-1] = '\0';
+ }
+ }
+ if (scp->volumeCreationDate) {
+ t = scp->volumeCreationDate;
+ cdrot = ctime(&t);
+ if (cdrot) {
+ cdrot = strdup(cdrot);
+ cdrot[strlen(cdrot)-1] = '\0';
+ }
+ }
+ sprintf(output,
+ "%s scp=0x%p, fid (cell=%d, volume=%d, vnode=%d, unique=%d) type=%d dv=%I64d len=0x%I64x "
+ "mp='%s' Locks (server=0x%x shared=%d excl=%d clnt=%d) fsLockCount=%d linkCount=%d anyAccess=0x%x "
+ "flags=0x%x cbServer='%s' cbExpires='%s' volumeCreationDate='%s' refCount=%u\r\n",
+ cookie, scp, scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique,
+ scp->fileType, scp->dataVersion, scp->length.QuadPart, scp->mountPointStringp,
+ scp->serverLock, scp->sharedLocks, scp->exclusiveLocks, scp->clientLocks, scp->fsLockCount,
+ scp->linkCount, scp->anyAccess, scp->flags, srvStr ? srvStr : "<none>", cbt ? cbt : "<none>",
+ cdrot ? cdrot : "<none>", scp->refCount);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
if (scp->fileLocksH) {
for (q = scp->fileLocksH; q; q = osi_QNext(q)) {
cm_file_lock_t * lockp = (cm_file_lock_t *)((char *) q - offsetof(cm_file_lock_t, fileq));
- sprintf(output, " %s lockp=0x%p scp=0x%p, cm_userp=0x%p offset=0x%I64x len=0x%08I64x type=0x%x key=0x%I64x flags=0x%x update=0x%I64u\r\n",
- cookie, lockp, lockp->scp, lockp->userp, lockp->range.offset, lockp->range.length,
- lockp->lockType, lockp->key, lockp->flags, (afs_uint64)lockp->lastUpdate);
+ sprintf(output, " %s lockp=0x%p scp=0x%p, cm_userp=0x%p offset=0x%I64x len=0x%08I64x type=0x%x "
+ "key=0x%I64x flags=0x%x update=0x%I64u\r\n",
+ cookie, lockp, lockp->scp, lockp->userp, lockp->range.offset, lockp->range.length,
+ lockp->lockType, lockp->key, lockp->flags, (afs_uint64)lockp->lastUpdate);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
}
sprintf(output, " %s - done dumping scp locks\r\n", cookie);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
}
+
+ if (srvStr) {
+ if (srvStrRpc)
+ RpcStringFree(&srvStr);
+ else
+ free(srvStr);
+ }
+ if (cbt)
+ free(cbt);
+ if (cdrot)
+ free(cdrot);
}
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);
+ 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++)
git://git.openafs.org / openafs.git / blobdiff