buf_CleanDirtyBuffers(scp);
} else {
/* look for things that shouldn't still be set */
- osi_assert(scp->bufWritesp == NULL);
- osi_assert(scp->bufReadsp == NULL);
+ osi_assertx(scp->bufWritesp == NULL, "non-null cm_scache_t bufWritesp");
+ osi_assertx(scp->bufReadsp == NULL, "non-null cm_scache_t bufReadsp");
}
#endif
| CM_SCACHEFLAG_EACCESS);
scp->serverModTime = 0;
scp->dataVersion = 0;
+ scp->bufDataVersionLow = 0;
scp->bulkStatProgress = hzero;
scp->waitCount = 0;
scp->waitQueueT = NULL;
scp->fid.volume = 0;
scp->fid.unique = 0;
scp->fid.cell = 0;
+ scp->fid.hash = 0;
/* remove from dnlc */
cm_dnlcPurgedp(scp);
scp;
scp = (cm_scache_t *) osi_QPrev(&scp->q))
{
- osi_assert(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.scacheHashTablep);
+ osi_assertx(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.scacheHashTablep,
+ "invalid cm_scache_t address");
if (scp->refCount == 0) {
if (scp->flags & CM_SCACHEFLAG_DELETED) {
* 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);
+ osi_assertx(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.scacheHashTablep,
+ "invalid cm_scache_t address");
memset(scp, 0, sizeof(cm_scache_t));
scp->magic = CM_SCACHE_MAGIC;
- lock_InitializeMutex(&scp->mx, "cm_scache_t mutex");
+ lock_InitializeRWLock(&scp->rw, "cm_scache_t rw");
lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock");
#ifdef USE_BPLUS
lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock");
return scp;
}
+void cm_SetFid(cm_fid_t *fidp, afs_uint32 cell, afs_uint32 volume, afs_uint32 vnode, afs_uint32 unique)
+{
+ fidp->cell = cell;
+ fidp->volume = volume;
+ fidp->vnode = vnode;
+ fidp->unique = unique;
+ fidp->hash = ((cell & 0xF) << 28) | ((volume & 0x3F) << 22) | ((vnode & 0x7FF) << 11) | (unique & 0x7FF);
+}
+
/* like strcmp, only for fids */
-int cm_FidCmp(cm_fid_t *ap, cm_fid_t *bp)
+__inline int cm_FidCmp(cm_fid_t *ap, cm_fid_t *bp)
{
- if (ap->vnode != bp->vnode)
+ if (ap->hash != bp->hash)
+ return 1;
+ if (ap->vnode != bp->vnode)
return 1;
if (ap->volume != bp->volume)
return 1;
cm_data.fakeSCache.linkCount = 1;
cm_data.fakeSCache.refCount = 1;
}
- lock_InitializeMutex(&cm_data.fakeSCache.mx, "cm_scache_t mutex");
+ lock_InitializeRWLock(&cm_data.fakeSCache.rw, "cm_scache_t rw");
}
long
for ( i=0; i < cm_data.scacheHashTableSize; i++ ) {
for ( scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp ) {
+ afs_uint32 hash;
+ hash = CM_SCACHE_HASH(&scp->fid);
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");
fprintf(stderr, "cm_ValidateSCache failure: scp->volp->magic != CM_VOLUME_MAGIC\n");
return -12;
}
+ if (hash != i) {
+ afsi_log("cm_ValidateSCache failure: scp hash != hash index");
+ fprintf(stderr, "cm_ValidateSCache failure: scp hash != hash index\n");
+ return -13;
+ }
}
}
* without network, the stat cache item will still be
* considered valid.
*/
- now = osi_Time();
+ now = time(NULL);
lock_ObtainWrite(&cm_scacheLock);
for ( scp = cm_data.allSCachesp; scp; scp = scp->allNextp ) {
- if (scp->cbServerp)
+ if (scp->cbServerp) {
+ if (scp->flags & CM_SCACHEFLAG_PURERO && scp->volp) {
+ if (scp->volp->cbExpiresRO == scp->cbExpires) {
+ scp->volp->cbExpiresRO = now+1;
+ }
+ }
scp->cbExpires = now+1;
+ }
}
lock_ReleaseWrite(&cm_scacheLock);
}
for ( scp = cm_data.allSCachesp; scp;
scp = scp->allNextp ) {
if (scp->randomACLp) {
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_FreeAllACLEnts(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
}
if (scp->cbServerp) {
scp->dirDataVersion = -1;
lock_FinalizeRWLock(&scp->dirlock);
#endif
- lock_FinalizeMutex(&scp->mx);
+ lock_FinalizeRWLock(&scp->rw);
lock_FinalizeRWLock(&scp->bufCreateLock);
}
lock_ReleaseWrite(&cm_scacheLock);
for ( scp = cm_data.allSCachesp; scp;
scp = scp->allNextp ) {
- lock_InitializeMutex(&scp->mx, "cm_scache_t mutex");
+ lock_InitializeRWLock(&scp->rw, "cm_scache_t rw");
lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock");
#ifdef USE_BPLUS
lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock");
return NULL;
}
- lock_ObtainWrite(&cm_scacheLock);
+ lock_ObtainRead(&cm_scacheLock);
for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
if (cm_FidCmp(fidp, &scp->fid) == 0) {
cm_HoldSCacheNoLock(scp);
+ lock_ConvertRToW(&cm_scacheLock);
cm_AdjustScacheLRU(scp);
lock_ReleaseWrite(&cm_scacheLock);
return scp;
}
}
- lock_ReleaseWrite(&cm_scacheLock);
+ lock_ReleaseRead(&cm_scacheLock);
return NULL;
}
long code;
cm_volume_t *volp = NULL;
cm_cell_t *cellp;
- char* mp = NULL;
- int special; // yj: boolean variable to test if file is on root.afs
- int isRoot;
+ int special = 0; // yj: boolean variable to test if file is on root.afs
+ int isRoot = 0;
extern cm_fid_t cm_rootFid;
hash = CM_SCACHE_HASH(fidp);
- osi_assert(fidp->cell != 0);
+ osi_assertx(fidp->cell != 0, "unassigned cell value");
if (fidp->cell== cm_data.rootFid.cell &&
fidp->volume==cm_data.rootFid.volume &&
}
if (cm_freelanceEnabled && special) {
+ char mp[MOUNTPOINTLEN] = "";
+ afs_uint32 fileType;
+
osi_Log0(afsd_logp,"cm_GetSCache Freelance and special");
- if (fidp->vnode > 1 && fidp->vnode <= cm_noLocalMountPoints + 2) {
- lock_ObtainMutex(&cm_Freelance_Lock);
- mp =(cm_localMountPoints+fidp->vnode-2)->mountPointStringp;
- lock_ReleaseMutex(&cm_Freelance_Lock);
+ 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 {
- mp = "";
+ fileType = CM_SCACHETYPE_INVALID;
+
}
+ lock_ReleaseMutex(&cm_Freelance_Lock);
+
scp = cm_GetNewSCache();
if (scp == NULL) {
osi_Log0(afsd_logp,"cm_GetSCache unable to obtain *new* scache entry");
* assume that no one else is using the one this is returned.
*/
lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
lock_ObtainWrite(&cm_scacheLock);
#endif
scp->fid = *fidp;
scp->volp = cm_data.rootSCachep->volp;
- cm_GetVolume(scp->volp); /* grab an additional reference */
+ if (scp->volp)
+ cm_GetVolume(scp->volp); /* grab an additional reference */
scp->dotdotFid.cell=AFS_FAKE_ROOT_CELL_ID;
scp->dotdotFid.volume=AFS_FAKE_ROOT_VOL_ID;
scp->dotdotFid.unique=1;
scp->flags |= CM_SCACHEFLAG_INHASH;
scp->refCount = 1;
osi_Log1(afsd_logp,"cm_GetSCache (freelance) sets refCount to 1 scp 0x%x", scp);
- if (fidp->vnode > 1 && fidp->vnode <= cm_noLocalMountPoints + 2)
- scp->fileType = (cm_localMountPoints+fidp->vnode-2)->fileType;
- else
- scp->fileType = CM_SCACHETYPE_INVALID;
-
- lock_ObtainMutex(&cm_Freelance_Lock);
+ scp->fileType = fileType;
scp->length.LowPart = (DWORD)strlen(mp)+4;
scp->length.HighPart = 0;
strncpy(scp->mountPointStringp,mp,MOUNTPOINTLEN);
- scp->mountPointStringp[MOUNTPOINTLEN-1] = '\0';
- lock_ReleaseMutex(&cm_Freelance_Lock);
-
scp->owner=0x0;
scp->unixModeBits=0777;
scp->clientModTime=FakeFreelanceModTime;
scp->parentVnode=0x1;
scp->group=0;
scp->dataVersion=cm_data.fakeDirVersion;
+ scp->bufDataVersionLow=cm_data.fakeDirVersion;
scp->lockDataVersion=-1; /* no lock yet */
#if not_too_dangerous
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
#endif
*outScpp = scp;
lock_ReleaseWrite(&cm_scacheLock);
/* otherwise, we need to find the volume */
if (!cm_freelanceEnabled || !isRoot) {
lock_ReleaseWrite(&cm_scacheLock); /* for perf. reasons */
- cellp = cm_FindCellByID(fidp->cell);
+ cellp = cm_FindCellByID(fidp->cell, 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
osi_Log1(afsd_logp,"cm_GetSCache (3) outScpp 0x%p", scp);
#endif
cm_HoldSCacheNoLock(scp);
- osi_assert(scp->volp == volp);
+ osi_assertx(scp->volp == volp, "cm_scache_t volume has unexpected value");
cm_AdjustScacheLRU(scp);
lock_ReleaseWrite(&cm_scacheLock);
if (volp)
}
osi_Log2(afsd_logp,"cm_GetNewSCache returns scp 0x%x flags 0x%x", scp, scp->flags);
- osi_assert(!(scp->flags & CM_SCACHEFLAG_INHASH));
+ osi_assertx(!(scp->flags & CM_SCACHEFLAG_INHASH), "CM_SCACHEFLAG_INHASH set");
#if not_too_dangerous
/* dropping the cm_scacheLock allows more than one thread
* assume that no one else is using the one this is returned.
*/
lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
lock_ObtainWrite(&cm_scacheLock);
#endif
scp->fid = *fidp;
scp->refCount = 1;
osi_Log1(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%x", scp);
#if not_too_dangerous
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
#endif
/* XXX - The following fields in the cm_scache are
cm_fid_t parent_fid;
cm_scache_t * pscp = NULL;
- lock_ObtainRead(&cm_scacheLock);
- parent_fid = scp->fid;
- parent_fid.vnode = scp->parentVnode;
- parent_fid.unique = scp->parentUnique;
+ lock_ObtainWrite(&cm_scacheLock);
+ cm_SetFid(&parent_fid, scp->fid.cell, scp->fid.volume, scp->parentVnode, scp->parentUnique);
if (cm_FidCmp(&scp->fid, &parent_fid)) {
i = CM_SCACHE_HASH(&parent_fid);
}
}
- lock_ReleaseRead(&cm_scacheLock);
+ lock_ReleaseWrite(&cm_scacheLock);
return pscp;
}
{
cm_scache_waiter_t * w;
+ /* Do not use the queue for asynchronous store operations */
+ if (flags == CM_SCACHESYNC_ASYNCSTORE)
+ return;
+
lock_ObtainWrite(&cm_scacheLock);
if (cm_allFreeWaiters == NULL) {
w = malloc(sizeof(*w));
cm_scache_waiter_t * w;
int this_is_me;
+ /* Do not use the queue for asynchronous store operations */
+ if (flags == CM_SCACHESYNC_ASYNCSTORE)
+ return 1;
+
osi_Log0(afsd_logp, "cm_SyncOpCheckContinue checking for continuation");
lock_ObtainRead(&cm_scacheLock);
}
}
- osi_assert(w != NULL);
+ osi_assertx(w != NULL, "null cm_scache_waiter_t");
this_is_me = (w->threadId == thrd_Current());
lock_ReleaseRead(&cm_scacheLock);
bufLocked = flags & CM_SCACHESYNC_BUFLOCKED;
if (bufp)
- osi_assert(bufp->refCount > 0);
+ osi_assertx(bufp->refCount > 0, "cm_buf_t refCount 0");
/* Do the access check. Now we don't really do the access check
lock_ReleaseMutex(&bufp->mx);
code = cm_GetCallback(scp, userp, reqp, (flags & CM_SCACHESYNC_FORCECB)?1:0);
if (bufLocked) {
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
lock_ObtainMutex(&bufp->mx);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
}
if (code)
return code;
if (rights) {
/* can't check access rights without a callback */
- osi_assert(flags & CM_SCACHESYNC_NEEDCALLBACK);
+ osi_assertx(flags & CM_SCACHESYNC_NEEDCALLBACK, "!CM_SCACHESYNC_NEEDCALLBACK");
if ((rights & PRSFS_WRITE) && (scp->flags & CM_SCACHEFLAG_RO))
return CM_ERROR_READONLY;
if (bufLocked) lock_ReleaseMutex(&bufp->mx);
code = cm_GetAccessRights(scp, userp, reqp);
if (bufLocked) {
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
lock_ObtainMutex(&bufp->mx);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
}
if (code)
return code;
scp->waitCount = scp->waitRequests = 1;
}
- if (bufLocked)
- lock_ReleaseMutex(&bufp->mx);
-
cm_SyncOpAddToWaitQueue(scp, flags, bufp);
wakeupCycle = 0;
do {
- if (wakeupCycle++ != 0)
- lock_ObtainMutex(&scp->mx);
- osi_SleepM((LONG_PTR) &scp->flags, &scp->mx);
+ if (bufLocked)
+ lock_ReleaseMutex(&bufp->mx);
+ osi_SleepW((LONG_PTR) &scp->flags, &scp->rw);
+ if (bufLocked)
+ lock_ObtainMutex(&bufp->mx);
+ lock_ObtainWrite(&scp->rw);
} while (!cm_SyncOpCheckContinue(scp, flags, bufp));
smb_UpdateServerPriority();
- if (bufLocked)
- lock_ObtainMutex(&bufp->mx);
- lock_ObtainMutex(&scp->mx);
scp->waitCount--;
osi_Log3(afsd_logp, "CM SyncOp woke! scp 0x%p; still waiting %d threads of %d requests",
scp, scp->waitCount, scp->waitRequests);
if (bufp) {
for(qdp = scp->bufReadsp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
tbufp = osi_GetQData(qdp);
- osi_assert(tbufp != bufp);
+ osi_assertx(tbufp != bufp, "unexpected cm_buf_t value");
}
}
if (bufp) {
for(qdp = scp->bufWritesp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
tbufp = osi_GetQData(qdp);
- osi_assert(tbufp != bufp);
+ osi_assertx(tbufp != bufp, "unexpected cm_buf_t value");
}
}
osi_queueData_t *qdp;
cm_buf_t *tbufp;
- lock_AssertMutex(&scp->mx);
+ lock_AssertWrite(&scp->rw);
/* now, update the recorded state for RPC-type calls */
if (flags & CM_SCACHESYNC_FETCHSTATUS)
if (flags & CM_SCACHESYNC_WRITE) {
if (bufp) {
- osi_assert(bufp->cmFlags & CM_BUF_CMWRITING);
+ osi_assertx(bufp->cmFlags & CM_BUF_CMWRITING, "!CM_BUF_CMWRITING");
bufp->cmFlags &= ~CM_BUF_CMWRITING;
}
AFSVolSync *volsyncp,
cm_user_t *userp, 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
statusp->LinkCount = scp->linkCount;
statusp->Length = cm_fakeDirSize;
statusp->Length_hi = 0;
- statusp->DataVersion = cm_data.fakeDirVersion;
+ statusp->DataVersion = (afs_uint32)(cm_data.fakeDirVersion & 0xFFFFFFFF);
statusp->Author = 0x1;
statusp->Owner = 0x0;
statusp->CallerAccess = 0x9;
statusp->ServerModTime = FakeFreelanceModTime;
statusp->Group = 0;
statusp->SyncCounter = 0;
- statusp->dataVersionHigh = 0;
- statusp->errorCode = 0;
+ statusp->dataVersionHigh = (afs_uint32)(cm_data.fakeDirVersion >> 32);
+ statusp->errorCode = 0;
}
#endif /* AFS_FREELANCE_CLIENT */
scp->unixModeBits = 0;
scp->anyAccess = 0;
scp->dataVersion = 0;
+ scp->bufDataVersionLow = 0;
if (dscp) {
scp->parentVnode = dscp->fid.vnode;
scp->flags &= ~CM_SCACHEFLAG_EACCESS;
}
- if (!(flags & CM_MERGEFLAG_FORCE)
- && statusp->DataVersion < (unsigned long) scp->dataVersion) {
+ dataVersion = statusp->dataVersionHigh;
+ dataVersion <<= 32;
+ dataVersion |= statusp->DataVersion;
+
+ if (!(flags & CM_MERGEFLAG_FORCE) && dataVersion < scp->dataVersion) {
struct cm_cell *cellp;
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
if (scp->cbServerp) {
struct cm_volume *volp = NULL;
cm_PutVolume(volp);
}
osi_Log3(afsd_logp, "Bad merge, scp %x, scp dv %d, RPC dv %d",
- scp, scp->dataVersion, statusp->DataVersion);
+ scp, scp->dataVersion, dataVersion);
/* we have a number of data fetch/store operations running
* concurrently, and we can tell which one executed last at the
* server by its mtime.
cm_AddACLCache(scp, userp, statusp->CallerAccess);
}
- if ((flags & CM_MERGEFLAG_STOREDATA) &&
- statusp->DataVersion - scp->dataVersion == 1) {
- cm_buf_t *bp;
-
- for (bp = cm_data.buf_fileHashTablepp[BUF_FILEHASH(&scp->fid)]; bp; bp=bp->fileHashp)
+ if (scp->dataVersion != 0 &&
+ (!(flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) && dataVersion != scp->dataVersion ||
+ (flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) && dataVersion - scp->dataVersion > 1)) {
+ /*
+ * We now know that all of the data buffers that we have associated
+ * with this scp are invalid. Subsequent operations will go faster
+ * if the buffers are removed from the hash tables.
+ *
+ * We do not remove directory buffers if the dataVersion delta is 1 because
+ * those version numbers will be updated as part of the directory operation.
+ *
+ * We do not remove storedata buffers because they will still be valid.
+ */
+ int i, j;
+ cm_buf_t **lbpp;
+ cm_buf_t *tbp;
+ cm_buf_t *bp, *prevBp, *nextBp;
+
+ lock_ObtainWrite(&buf_globalLock);
+ i = BUF_FILEHASH(&scp->fid);
+ for (bp = cm_data.buf_fileHashTablepp[i]; bp; bp=nextBp)
{
- if (cm_FidCmp(&scp->fid, &bp->fid) == 0 &&
- bp->dataVersion == scp->dataVersion)
- bp->dataVersion = statusp->DataVersion;
- }
+ nextBp = bp->fileHashp;
+ /*
+ * if the buffer belongs to this stat cache entry
+ * and the buffer mutex can be obtained, check the
+ * reference count and if it is zero, remove the buffer
+ * from the hash tables. If there are references,
+ * the buffer might be updated to the current version
+ * so leave it in place.
+ */
+ if (cm_FidCmp(&scp->fid, &bp->fid) == 0 &&
+ lock_TryMutex(&bp->mx)) {
+ if (bp->refCount == 0 &&
+ !(bp->flags & CM_BUF_READING | CM_BUF_WRITING | CM_BUF_DIRTY)) {
+ prevBp = bp->fileHashBackp;
+ bp->fileHashBackp = bp->fileHashp = NULL;
+ if (prevBp)
+ prevBp->fileHashp = nextBp;
+ else
+ cm_data.buf_fileHashTablepp[i] = nextBp;
+ if (nextBp)
+ nextBp->fileHashBackp = prevBp;
+
+ j = BUF_HASH(&bp->fid, &bp->offset);
+ lbpp = &(cm_data.buf_scacheHashTablepp[j]);
+ for(tbp = *lbpp; tbp; lbpp = &tbp->hashp, tbp = *lbpp) {
+ if (tbp == bp)
+ break;
+ }
+
+ *lbpp = bp->hashp; /* hash out */
+ bp->hashp = NULL;
+ bp->flags &= ~CM_BUF_INHASH;
+ }
+ lock_ReleaseMutex(&bp->mx);
+ }
+ }
+ lock_ReleaseWrite(&buf_globalLock);
}
- scp->dataVersion = statusp->DataVersion;
+
+ /* We maintain a range of buffer dataVersion values which are considered
+ * valid. This avoids the need to update the dataVersion on each buffer
+ * object during an uncontested storeData operation. As a result this
+ * merge status no longer has performance characteristics derived from
+ * the size of the file.
+ */
+ if (((flags & CM_MERGEFLAG_STOREDATA) && dataVersion - scp->dataVersion > 1) ||
+ (!(flags & CM_MERGEFLAG_STOREDATA) && scp->dataVersion != dataVersion) ||
+ scp->bufDataVersionLow == 0)
+ scp->bufDataVersionLow = dataVersion;
+
+ scp->dataVersion = dataVersion;
}
/* note that our stat cache info is incorrect, so force us eventually
*/
void cm_DiscardSCache(cm_scache_t *scp)
{
- lock_AssertMutex(&scp->mx);
+ lock_AssertWrite(&scp->rw);
if (scp->cbServerp) {
cm_PutServer(scp->cbServerp);
scp->cbServerp = NULL;
cm_dnlcPurgevp(scp);
cm_FreeAllACLEnts(scp);
+ if (scp->fileType == CM_SCACHETYPE_DFSLINK)
+ cm_VolStatus_Invalidate_DFS_Mapping(scp);
+
/* Force mount points and symlinks to be re-evaluated */
scp->mountPointStringp[0] = '\0';
}
#else
void cm_HoldSCacheNoLock(cm_scache_t *scp)
#endif
-{
- osi_assert(scp != 0);
- scp->refCount++;
+{
+ afs_int32 refCount;
+
+ osi_assertx(scp != NULL, "null cm_scache_t");
+ lock_AssertAny(&cm_scacheLock);
+ refCount = InterlockedIncrement(&scp->refCount);
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_HoldSCacheNoLock scp 0x%p ref %d",scp, scp->refCount);
- afsi_log("%s:%d cm_HoldSCacheNoLock scp 0x%p, ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_HoldSCacheNoLock scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_HoldSCacheNoLock scp 0x%p, ref %d", file, line, scp, refCount);
#endif
}
void cm_HoldSCache(cm_scache_t *scp)
#endif
{
- osi_assert(scp != 0);
- lock_ObtainWrite(&cm_scacheLock);
- scp->refCount++;
+ afs_int32 refCount;
+
+ osi_assertx(scp != NULL, "null cm_scache_t");
+ lock_ObtainRead(&cm_scacheLock);
+ refCount = InterlockedIncrement(&scp->refCount);
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_HoldSCache scp 0x%p ref %d",scp, scp->refCount);
- afsi_log("%s:%d cm_HoldSCache scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_HoldSCache scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_HoldSCache scp 0x%p ref %d", file, line, scp, refCount);
#endif
- lock_ReleaseWrite(&cm_scacheLock);
+ lock_ReleaseRead(&cm_scacheLock);
}
#ifdef DEBUG_REFCOUNT
void cm_ReleaseSCacheNoLock(cm_scache_t *scp)
#endif
{
- osi_assert(scp != NULL);
- if (scp->refCount == 0)
+ afs_int32 refCount;
+ osi_assertx(scp != NULL, "null cm_scache_t");
+ lock_AssertAny(&cm_scacheLock);
+ refCount = InterlockedDecrement(&scp->refCount);
+#ifdef DEBUG_REFCOUNT
+ if (refCount < 0)
osi_Log1(afsd_logp,"cm_ReleaseSCacheNoLock about to panic scp 0x%x",scp);
- osi_assert(scp->refCount-- >= 0);
+#endif
+ osi_assertx(refCount >= 0, "cm_scache_t refCount 0");
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_ReleaseSCacheNoLock scp 0x%p ref %d",scp,scp->refCount);
- afsi_log("%s:%d cm_ReleaseSCacheNoLock scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_ReleaseSCacheNoLock scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_ReleaseSCacheNoLock scp 0x%p ref %d", file, line, scp, refCount);
#endif
}
#else
void cm_ReleaseSCache(cm_scache_t *scp)
#endif
-{
- osi_assert(scp != NULL);
- lock_ObtainWrite(&cm_scacheLock);
- if (scp->refCount == 0)
+{
+ afs_int32 refCount;
+
+ osi_assertx(scp != NULL, "null cm_scache_t");
+ lock_ObtainRead(&cm_scacheLock);
+ refCount = InterlockedDecrement(&scp->refCount);
+#ifdef DEBUG_REFCOUNT
+ if (refCount < 0)
osi_Log1(afsd_logp,"cm_ReleaseSCache about to panic scp 0x%x",scp);
- osi_assert(scp->refCount != 0);
- scp->refCount--;
+#endif
+ osi_assertx(refCount >= 0, "cm_scache_t refCount 0");
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_ReleaseSCache scp 0x%p ref %d",scp,scp->refCount);
- afsi_log("%s:%d cm_ReleaseSCache scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_ReleaseSCache scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_ReleaseSCache scp 0x%p ref %d", file, line, scp, refCount);
#endif
- lock_ReleaseWrite(&cm_scacheLock);
+ lock_ReleaseRead(&cm_scacheLock);
}
/* just look for the scp entry to get filetype */
hash = CM_SCACHE_HASH(fidp);
- osi_assert(fidp->cell != 0);
+ osi_assertx(fidp->cell != 0, "unassigned cell value");
lock_ObtainWrite(&cm_scacheLock);
for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
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",
+ sprintf(output, "%s scp=0x%p, fid (cell=%d, volume=%d, vnode=%d, unique=%d) volp=0x%p type=%d dv=%I64d 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);