/* 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);
+ lock_AssertWrite(&cm_scacheLock);
osi_QRemoveHT((osi_queue_t **) &cm_data.scacheLRUFirstp, (osi_queue_t **) &cm_data.scacheLRULastp, &scp->q);
- osi_QAdd((osi_queue_t **) &cm_data.scacheLRUFirstp, &scp->q);
- if (!cm_data.scacheLRULastp)
- cm_data.scacheLRULastp = scp;
+ osi_QAddH((osi_queue_t **) &cm_data.scacheLRUFirstp, (osi_queue_t **) &cm_data.scacheLRULastp, &scp->q);
}
-/* call with scache write-locked and mutex held */
+/* call with cm_scacheLock write-locked and scp rw held */
void cm_RemoveSCacheFromHashTable(cm_scache_t *scp)
{
cm_scache_t **lscpp;
cm_scache_t *tscp;
int i;
+ lock_AssertWrite(&cm_scacheLock);
+ lock_AssertWrite(&scp->rw);
if (scp->flags & CM_SCACHEFLAG_INHASH) {
/* hash it out first */
i = CM_SCACHE_HASH(&scp->fid);
lscpp = &tscp->nextp, tscp = tscp->nextp) {
if (tscp == scp) {
*lscpp = scp->nextp;
+ scp->nextp = NULL;
scp->flags &= ~CM_SCACHEFLAG_INHASH;
break;
}
}
}
-/* called with cm_scacheLock write-locked; recycles an existing scp.
- *
- * this function ignores all of the locking hierarchy.
- */
+/* called with cm_scacheLock and scp write-locked */
+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);
+ }
+#endif
+}
+
+/* called with cm_scacheLock and scp write-locked; recycles an existing scp. */
long cm_RecycleSCache(cm_scache_t *scp, afs_int32 flags)
{
if (scp->refCount != 0) {
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;
* tried to store this to server but failed */
scp->mask = 0;
- /* drop held volume ref */
- if (scp->volp) {
- cm_PutVolume(scp->volp);
- scp->volp = NULL;
- }
-
/* discard symlink info */
scp->mountPointStringp[0] = '\0';
memset(&scp->mountRootFid, 0, sizeof(cm_fid_t));
scp->serverLock = (-1);
scp->exclusiveLocks = 0;
scp->sharedLocks = 0;
- scp->lockDataVersion = -1;
+ scp->lockDataVersion = CM_SCACHE_VERSION_BAD;
/* not locked, but there can be no references to this guy
* while we hold the global refcount lock.
*/
cm_FreeAllACLEnts(scp);
-#ifdef USE_BPLUS
- /* destroy directory Bplus Tree */
- if (scp->dirBplus) {
- LARGE_INTEGER start, end;
- QueryPerformanceCounter(&start);
- bplus_free_tree++;
- freeBtree(scp->dirBplus);
- scp->dirBplus = NULL;
- QueryPerformanceCounter(&end);
-
- bplus_free_time += (end.QuadPart - start.QuadPart);
- }
-#endif
+ cm_ResetSCacheDirectory(scp, 0);
return 0;
}
-/* called with cm_scacheLock write-locked; find a vnode to recycle.
+/*
+ * called with cm_scacheLock write-locked; find a vnode to recycle.
* Can allocate a new one if desperate, or if below quota (cm_data.maxSCaches).
+ * returns scp->mx held.
*/
cm_scache_t *cm_GetNewSCache(void)
{
cm_scache_t *scp;
int retry = 0;
+ lock_AssertWrite(&cm_scacheLock);
#if 0
/* first pass - look for deleted objects */
for ( scp = cm_data.scacheLRULastp;
if (scp->refCount == 0) {
if (scp->flags & CM_SCACHEFLAG_DELETED) {
+ if (!lock_TryWrite(&scp->rw))
+ continue;
+
osi_Log1(afsd_logp, "GetNewSCache attempting to recycle deleted scp 0x%x", scp);
if (!cm_RecycleSCache(scp, CM_SCACHE_RECYCLEFLAG_DESTROY_BUFFERS)) {
/* and we're done */
return scp;
}
+ lock_ReleaseWrite(&scp->rw);
osi_Log1(afsd_logp, "GetNewSCache recycled failed scp 0x%x", scp);
} else if (!(scp->flags & CM_SCACHEFLAG_INHASH)) {
+ if (!lock_TryWrite(&scp->rw))
+ continue;
+
/* we found an entry, so return it */
/* now remove from the LRU queue and put it back at the
* head of the LRU queue.
* we must not recycle the scp. */
if (scp->refCount == 0 && scp->bufReadsp == NULL && scp->bufWritesp == NULL) {
if (!buf_DirtyBuffersExist(&scp->fid)) {
+ if (!lock_TryWrite(&scp->rw))
+ continue;
+
if (!cm_RecycleSCache(scp, 0)) {
/* we found an entry, so return it */
/* now remove from the LRU queue and put it back at the
/* and we're done */
return scp;
}
+ lock_ReleaseWrite(&scp->rw);
} else {
osi_Log1(afsd_logp,"GetNewSCache dirty buffers exist scp 0x%x", scp);
}
"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->bufCreateLock, "cm_scache_t bufCreateLock");
+ lock_InitializeRWLock(&scp->rw, "cm_scache_t rw", LOCK_HIERARCHY_SCACHE);
+ osi_assertx(lock_TryWrite(&scp->rw), "cm_scache_t rw held after allocation");
+ lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock", LOCK_HIERARCHY_SCACHE_BUFCREATE);
#ifdef USE_BPLUS
- lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock");
+ lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock", LOCK_HIERARCHY_SCACHE_DIRLOCK);
#endif
scp->serverLock = -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", LOCK_HIERARCHY_SCACHE);
}
long
fprintf(stderr, "cm_ValidateSCache failure: scp->randomACLp->magic != CM_ACLENT_MAGIC\n");
return -3;
}
- if (scp->volp && scp->volp->magic != CM_VOLUME_MAGIC) {
- afsi_log("cm_ValidateSCache failure: scp->volp->magic != CM_VOLUME_MAGIC");
- fprintf(stderr, "cm_ValidateSCache failure: scp->volp->magic != CM_VOLUME_MAGIC\n");
- return -4;
- }
if (i > cm_data.currentSCaches ) {
afsi_log("cm_ValidateSCache failure: LRU First queue loops");
fprintf(stderr, "cm_ValidateSCache failure: LUR First queue loops\n");
fprintf(stderr, "cm_ValidateSCache failure: scp->randomACLp->magic != CM_ACLENT_MAGIC\n");
return -7;
}
- if (scp->volp && scp->volp->magic != CM_VOLUME_MAGIC) {
- afsi_log("cm_ValidateSCache failure: scp->volp->magic != CM_VOLUME_MAGIC");
- fprintf(stderr, "cm_ValidateSCache failure: scp->volp->magic != CM_VOLUME_MAGIC\n");
- return -8;
- }
if (i > cm_data.currentSCaches ) {
afsi_log("cm_ValidateSCache failure: LRU Last queue loops");
fprintf(stderr, "cm_ValidateSCache failure: LUR Last queue loops\n");
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->randomACLp->magic != CM_ACLENT_MAGIC\n");
return -11;
}
- if (scp->volp && scp->volp->magic != CM_VOLUME_MAGIC) {
- afsi_log("cm_ValidateSCache failure: scp->volp->magic != CM_VOLUME_MAGIC");
- 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;
}
}
}
lock_ObtainWrite(&cm_scacheLock);
for ( scp = cm_data.allSCachesp; scp; scp = scp->allNextp ) {
if (scp->cbServerp) {
- if (scp->flags & CM_SCACHEFLAG_PURERO && scp->volp) {
- if (scp->volp->cbExpiresRO == scp->cbExpires) {
- scp->volp->cbExpiresRO = now+1;
+ if (scp->flags & CM_SCACHEFLAG_PURERO) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ if (volp->cbExpiresRO == scp->cbExpires)
+ volp->cbExpiresRO = now+1;
+ cm_PutVolume(volp);
}
}
scp->cbExpires = now+1;
for ( scp = cm_data.allSCachesp; scp;
scp = scp->allNextp ) {
if (scp->randomACLp) {
- lock_ObtainMutex(&scp->mx);
+ lock_ReleaseWrite(&cm_scacheLock);
+ lock_ObtainWrite(&scp->rw);
+ lock_ObtainWrite(&cm_scacheLock);
cm_FreeAllACLEnts(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
}
if (scp->cbServerp) {
if (scp->dirBplus)
freeBtree(scp->dirBplus);
scp->dirBplus = NULL;
- scp->dirDataVersion = -1;
+ scp->dirDataVersion = CM_SCACHE_VERSION_BAD;
lock_FinalizeRWLock(&scp->dirlock);
#endif
- lock_FinalizeMutex(&scp->mx);
+ lock_FinalizeRWLock(&scp->rw);
lock_FinalizeRWLock(&scp->bufCreateLock);
}
lock_ReleaseWrite(&cm_scacheLock);
static osi_once_t once;
if (osi_Once(&once)) {
- lock_InitializeRWLock(&cm_scacheLock, "cm_scacheLock");
+ lock_InitializeRWLock(&cm_scacheLock, "cm_scacheLock", LOCK_HIERARCHY_SCACHE_GLOBAL);
if ( newFile ) {
memset(cm_data.scacheHashTablep, 0, sizeof(cm_scache_t *) * cm_data.scacheHashTableSize);
cm_data.allSCachesp = NULL;
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");
+ lock_InitializeRWLock(&scp->rw, "cm_scache_t rw", LOCK_HIERARCHY_SCACHE);
+ lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock", LOCK_HIERARCHY_SCACHE_BUFCREATE);
#ifdef USE_BPLUS
- lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock");
+ lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock", LOCK_HIERARCHY_SCACHE_DIRLOCK);
#endif
scp->cbServerp = NULL;
scp->cbExpires = 0;
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;
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;
}
#endif
{
long hash;
- cm_scache_t *scp;
+ cm_scache_t *scp = NULL;
long code;
cm_volume_t *volp = NULL;
cm_cell_t *cellp;
osi_assertx(fidp->cell != 0, "unassigned cell value");
- if (fidp->cell== cm_data.rootFid.cell &&
- fidp->volume==cm_data.rootFid.volume &&
- fidp->vnode==0x0 && fidp->unique==0x0)
- {
- osi_Log0(afsd_logp,"cm_GetSCache called with root cell/volume and vnode=0 and unique=0");
- }
+#ifdef AFS_FREELANCE_CLIENT
+ special = (fidp->cell==AFS_FAKE_ROOT_CELL_ID &&
+ fidp->volume==AFS_FAKE_ROOT_VOL_ID &&
+ !(fidp->vnode==0x1 && fidp->unique==0x1));
+ isRoot = (fidp->cell==AFS_FAKE_ROOT_CELL_ID &&
+ fidp->volume==AFS_FAKE_ROOT_VOL_ID &&
+ fidp->vnode==0x1 && fidp->unique==0x1);
+#endif
// yj: check if we have the scp, if so, we don't need
// to do anything else
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);
- osi_Log1(afsd_logp,"cm_GetSCache (1) outScpp 0x%p", scp);
+ afsi_log("%s:%d cm_GetSCache (1) scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log1(afsd_logp,"cm_GetSCache (1) scp 0x%p", scp);
+#endif
+#ifdef AFS_FREELANCE_CLIENT
+ if (cm_freelanceEnabled && special &&
+ cm_data.fakeDirVersion != scp->dataVersion)
+ break;
#endif
cm_HoldSCacheNoLock(scp);
*outScpp = scp;
// because we have to fill in the status stuff 'coz we
// don't want trybulkstat to fill it in for us
#ifdef AFS_FREELANCE_CLIENT
- special = (fidp->cell==AFS_FAKE_ROOT_CELL_ID &&
- fidp->volume==AFS_FAKE_ROOT_VOL_ID &&
- !(fidp->vnode==0x1 && fidp->unique==0x1));
- isRoot = (fidp->cell==AFS_FAKE_ROOT_CELL_ID &&
- fidp->volume==AFS_FAKE_ROOT_VOL_ID &&
- fidp->vnode==0x1 && fidp->unique==0x1);
if (cm_freelanceEnabled && isRoot) {
osi_Log0(afsd_logp,"cm_GetSCache Freelance and isRoot");
/* freelance: if we are trying to get the root scp for the first
}
if (cm_freelanceEnabled && special) {
- char mp[MOUNTPOINTLEN] = "";
- afs_uint32 fileType;
-
+ lock_ReleaseWrite(&cm_scacheLock);
osi_Log0(afsd_logp,"cm_GetSCache Freelance and special");
- 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;
+ if (cm_getLocalMountPointChange()) { // check for changes
+ cm_clearLocalMountPointChange(); // clear the changefile
+ cm_reInitLocalMountPoints(); // start reinit
}
- lock_ReleaseMutex(&cm_Freelance_Lock);
- scp = cm_GetNewSCache();
- if (scp == NULL) {
- osi_Log0(afsd_logp,"cm_GetSCache unable to obtain *new* scache entry");
+ lock_ObtainWrite(&cm_scacheLock);
+ if (scp == NULL) {
+ scp = cm_GetNewSCache(); /* returns scp->rw held */
+ if (scp == NULL) {
+ osi_Log0(afsd_logp,"cm_GetSCache unable to obtain *new* scache entry");
+ lock_ReleaseWrite(&cm_scacheLock);
+ return CM_ERROR_WOULDBLOCK;
+ }
+ } else {
lock_ReleaseWrite(&cm_scacheLock);
- return CM_ERROR_WOULDBLOCK;
- }
-
-#if not_too_dangerous
- /* dropping the cm_scacheLock allows more than one thread
- * to obtain the same cm_scache_t from the LRU list. Since
- * the refCount is known to be zero at this point we have to
- * assume that no one else is using the one this is returned.
- */
- lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
- lock_ObtainWrite(&cm_scacheLock);
-#endif
+ lock_ObtainWrite(&scp->rw);
+ lock_ObtainWrite(&cm_scacheLock);
+ }
scp->fid = *fidp;
- scp->volp = cm_data.rootSCachep->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->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;
+ if (!(scp->flags & CM_SCACHEFLAG_INHASH)) {
+ 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);
- 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->dataVersion=cm_data.fakeDirVersion;
scp->bufDataVersionLow=cm_data.fakeDirVersion;
scp->lockDataVersion=-1; /* no lock yet */
-#if not_too_dangerous
- lock_ReleaseMutex(&scp->mx);
-#endif
- *outScpp = scp;
+ lock_ReleaseWrite(&scp->rw);
lock_ReleaseWrite(&cm_scacheLock);
+ *outScpp = scp;
#ifdef DEBUG_REFCOUNT
- afsi_log("%s:%d cm_GetSCache (2) outScpp 0x%p ref %d", file, line, scp, scp->refCount);
- osi_Log1(afsd_logp,"cm_GetSCache (2) outScpp 0x%p", scp);
+ afsi_log("%s:%d cm_GetSCache (2) scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log1(afsd_logp,"cm_GetSCache (2) scp 0x%p", scp);
#endif
return 0;
}
if (!cellp)
return CM_ERROR_NOSUCHCELL;
- code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp, CM_GETVOL_FLAG_CREATE, &volp);
+ code = cm_FindVolumeByID(cellp, fidp->volume, userp, reqp, CM_GETVOL_FLAG_CREATE, &volp);
if (code)
return code;
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 (3) outScpp 0x%p ref %d", file, line, scp, scp->refCount);
- osi_Log1(afsd_logp,"cm_GetSCache (3) outScpp 0x%p", scp);
+ afsi_log("%s:%d cm_GetSCache (3) scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log1(afsd_logp,"cm_GetSCache (3) scp 0x%p", scp);
#endif
cm_HoldSCacheNoLock(scp);
- osi_assertx(scp->volp == volp, "cm_scache_t volume has unexpected value");
cm_AdjustScacheLRU(scp);
lock_ReleaseWrite(&cm_scacheLock);
if (volp)
}
/* now, if we don't have the fid, recycle something */
- scp = cm_GetNewSCache();
+ scp = cm_GetNewSCache(); /* returns scp->rw held */
if (scp == NULL) {
osi_Log0(afsd_logp,"cm_GetNewSCache unable to obtain *new* scache entry");
lock_ReleaseWrite(&cm_scacheLock);
cm_PutVolume(volp);
return CM_ERROR_WOULDBLOCK;
}
- osi_Log2(afsd_logp,"cm_GetNewSCache returns scp 0x%x flags 0x%x", scp, scp->flags);
+#ifdef DEBUG_REFCOUNT
+ afsi_log("%s:%d cm_GetNewSCache returns scp 0x%p flags 0x%x", file, line, scp, scp->flags);
+#endif
+ osi_Log2(afsd_logp,"cm_GetNewSCache returns scp 0x%p flags 0x%x", scp, scp->flags);
osi_assertx(!(scp->flags & CM_SCACHEFLAG_INHASH), "CM_SCACHEFLAG_INHASH set");
-#if not_too_dangerous
- /* dropping the cm_scacheLock allows more than one thread
- * to obtain the same cm_scache_t from the LRU list. Since
- * the refCount is known to be zero at this point we have to
- * assume that no one else is using the one this is returned.
- */
- lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
- lock_ObtainWrite(&cm_scacheLock);
-#endif
scp->fid = *fidp;
- scp->volp = volp; /* a held reference */
-
if (!cm_freelanceEnabled || !isRoot) {
/* if this scache entry represents a volume root then we need
* to copy the dotdotFipd from the volume structure where the
* "master" copy is stored (defect 11489)
*/
- if (scp->fid.vnode == 1 && scp->fid.unique == 1) {
- scp->dotdotFid = volp->dotdotFid;
- }
-
- if (volp->ro.ID == fidp->volume)
+ if (volp->vol[ROVOL].ID == fidp->volume) {
scp->flags |= (CM_SCACHEFLAG_PURERO | CM_SCACHEFLAG_RO);
- else if (volp->bk.ID == fidp->volume)
+ if (scp->fid.vnode == 1 && scp->fid.unique == 1)
+ scp->dotdotFid = cm_VolumeStateByType(volp, ROVOL)->dotdotFid;
+ } else if (volp->vol[BACKVOL].ID == fidp->volume) {
scp->flags |= CM_SCACHEFLAG_RO;
+ if (scp->fid.vnode == 1 && scp->fid.unique == 1)
+ scp->dotdotFid = cm_VolumeStateByType(volp, BACKVOL)->dotdotFid;
+ } else {
+ if (scp->fid.vnode == 1 && scp->fid.unique == 1)
+ scp->dotdotFid = cm_VolumeStateByType(volp, RWVOL)->dotdotFid;
+ }
}
+ if (volp)
+ cm_PutVolume(volp);
scp->nextp = cm_data.scacheHashTablep[hash];
cm_data.scacheHashTablep[hash] = scp;
scp->flags |= CM_SCACHEFLAG_INHASH;
+ lock_ReleaseWrite(&scp->rw);
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);
+#ifdef DEBUG_REFCOUNT
+ afsi_log("%s:%d cm_GetSCache sets refCount to 1 scp 0x%x", file, line, scp);
#endif
+ osi_Log1(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%x", scp);
/* XXX - The following fields in the cm_scache are
* uninitialized:
* parentVnode
* parentUnique
*/
- lock_ReleaseWrite(&cm_scacheLock);
/* now we have a held scache entry; just return it */
*outScpp = scp;
#ifdef DEBUG_REFCOUNT
- afsi_log("%s:%d cm_GetSCache (4) outScpp 0x%p ref %d", file, line, scp, scp->refCount);
- osi_Log1(afsd_logp,"cm_GetSCache (4) outScpp 0x%p", scp);
+ afsi_log("%s:%d cm_GetSCache (4) scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log1(afsd_logp,"cm_GetSCache (4) scp 0x%p", scp);
#endif
+ lock_ReleaseWrite(&cm_scacheLock);
return 0;
}
{
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);
afs_uint32 sleep_scp_bufs = 0;
int wakeupCycle;
+ lock_AssertWrite(&scp->rw);
+
/* lookup this first */
bufLocked = flags & CM_SCACHESYNC_BUFLOCKED;
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;
/* can't check access rights without a callback */
osi_assertx(flags & CM_SCACHESYNC_NEEDCALLBACK, "!CM_SCACHESYNC_NEEDCALLBACK");
- if ((rights & PRSFS_WRITE) && (scp->flags & CM_SCACHEFLAG_RO))
+ if ((rights & (PRSFS_WRITE|PRSFS_DELETE)) && (scp->flags & CM_SCACHEFLAG_RO))
return CM_ERROR_READONLY;
if (cm_HaveAccessRights(scp, userp, rights, &outRights)) {
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;
do {
if (bufLocked)
lock_ReleaseMutex(&bufp->mx);
- osi_SleepM((LONG_PTR) &scp->flags, &scp->mx);
+ osi_SleepW((LONG_PTR) &scp->flags, &scp->rw);
if (bufLocked)
lock_ObtainMutex(&bufp->mx);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
} while (!cm_SyncOpCheckContinue(scp, flags, bufp));
smb_UpdateServerPriority();
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)
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;
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;
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_GetVolumeByID(cellp, scp->fid.volume, userp,
- (cm_req_t *) NULL, CM_GETVOL_FLAG_CREATE, &volp);
+ cm_FindVolumeByID(cellp, scp->fid.volume, userp,
+ 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)");
}
if (scp->dataVersion != 0 &&
- (!(flags & CM_MERGEFLAG_DIROP) && dataVersion != scp->dataVersion ||
- (flags & CM_MERGEFLAG_DIROP) && dataVersion - scp->dataVersion > 1)) {
+ (!(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
*
* 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;
scp->bufDataVersionLow = dataVersion;
scp->dataVersion = dataVersion;
+
+ /*
+ * If someone is waiting for status information, we can wake them up
+ * now even though the entity that issued the FetchStatus may not
+ * have completed yet.
+ */
+ cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_FETCHSTATUS);
}
/* 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;
}
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);
#endif
{
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_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
+
+ if (refCount == 0 && (scp->flags & CM_SCACHEFLAG_DELETED)) {
+ int deleted = 0;
+ long lockstate;
+
+ lockstate = lock_GetRWLockState(&cm_scacheLock);
+ if (lockstate != OSI_RWLOCK_WRITEHELD)
+ lock_ReleaseRead(&cm_scacheLock);
+ else
+ lock_ReleaseWrite(&cm_scacheLock);
+
+ lock_ObtainWrite(&scp->rw);
+ if (scp->flags & CM_SCACHEFLAG_DELETED)
+ deleted = 1;
+
+ if (refCount == 0 && deleted) {
+ lock_ObtainWrite(&cm_scacheLock);
+ cm_RecycleSCache(scp, 0);
+ if (lockstate != OSI_RWLOCK_WRITEHELD)
+ lock_ConvertWToR(&cm_scacheLock);
+ } else {
+ if (lockstate != OSI_RWLOCK_WRITEHELD)
+ lock_ObtainRead(&cm_scacheLock);
+ else
+ lock_ObtainWrite(&cm_scacheLock);
+ }
+ lock_ReleaseWrite(&scp->rw);
+ }
}
#ifdef DEBUG_REFCOUNT
afsi_log("%s:%d cm_ReleaseSCache scp 0x%p ref %d", file, line, scp, refCount);
#endif
lock_ReleaseRead(&cm_scacheLock);
+
+ if (scp->flags & CM_SCACHEFLAG_DELETED) {
+ int deleted = 0;
+ lock_ObtainWrite(&scp->rw);
+ if (scp->flags & CM_SCACHEFLAG_DELETED)
+ deleted = 1;
+ if (deleted) {
+ lock_ObtainWrite(&cm_scacheLock);
+ cm_RecycleSCache(scp, 0);
+ lock_ReleaseWrite(&cm_scacheLock);
+ }
+ lock_ReleaseWrite(&scp->rw);
+ }
}
/* just look for the scp entry to get filetype */
{
int zilch;
cm_scache_t *scp;
+ osi_queue_t *q;
char output[2048];
int i;
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=%I64d 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) 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->volp, scp->fileType, scp->dataVersion, scp->length.QuadPart, scp->mountPointStringp, scp->flags,
- (unsigned long)scp->cbExpires, scp->refCount);
+ 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);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+
+ if (scp->fileLocksH) {
+ sprintf(output, " %s - begin dumping scp locks\r\n", cookie);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+
+ 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);
+ 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);
+ }
}
sprintf(output, "%s - Done dumping all scache.\r\n", cookie);
sprintf(output, "%s - Done dumping cm_data.scacheHashTable\r\n", cookie);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
-
+
+ sprintf(output, "%s - begin dumping all file locks\r\n", cookie);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+
+ for (q = cm_allFileLocks; q; q = osi_QNext(q)) {
+ cm_file_lock_t * lockp = (cm_file_lock_t *)q;
+ sprintf(output, "%s filelockp=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 all file locks\r\n", cookie);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+
if (lock)
lock_ReleaseRead(&cm_scacheLock);
return (0);
git://git.openafs.org / openafs.git / blobdiff