extern osi_hyper_t hzero;
-/* hash table stuff */
-cm_scache_t **cm_hashTablep;
-long cm_hashTableSize;
-long cm_maxSCaches;
-long cm_currentSCaches;
-
-/* LRU stuff */
-cm_scache_t *cm_scacheLRUFirstp;
-cm_scache_t *cm_scacheLRULastp;
-
/* File locks */
osi_queue_t *cm_allFileLocks;
+osi_queue_t *cm_freeFileLocks;
+unsigned long cm_lockRefreshCycle;
/* lock for globals */
osi_rwlock_t cm_scacheLock;
/* must be called with cm_scacheLock write-locked! */
void cm_AdjustLRU(cm_scache_t *scp)
{
- if (scp == cm_scacheLRULastp)
- cm_scacheLRULastp = (cm_scache_t *) osi_QPrev(&scp->q);
- osi_QRemove((osi_queue_t **) &cm_scacheLRUFirstp, &scp->q);
- osi_QAdd((osi_queue_t **) &cm_scacheLRUFirstp, &scp->q);
- if (!cm_scacheLRULastp)
- cm_scacheLRULastp = scp;
+ if (scp == cm_data.scacheLRULastp)
+ cm_data.scacheLRULastp = (cm_scache_t *) osi_QPrev(&scp->q);
+ 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;
}
-/* called with cm_scacheLock write-locked; find a vnode to recycle.
- * Can allocate a new one if desperate, or if below quota (cm_maxSCaches).
- */
-cm_scache_t *cm_GetNewSCache(void)
+/* called with cm_scacheLock write-locked; recycles an existing scp. */
+long cm_RecycleSCache(cm_scache_t *scp, afs_int32 flags)
{
- cm_scache_t *scp;
- int i;
cm_scache_t **lscpp;
cm_scache_t *tscp;
+ int i;
- if (cm_currentSCaches >= cm_maxSCaches) {
- for (scp = cm_scacheLRULastp;
- scp;
- scp = (cm_scache_t *) osi_QPrev(&scp->q)) {
- if (scp->refCount == 0)
- break;
+ 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) {
+ *lscpp = scp->nextp;
+ scp->flags &= ~CM_SCACHEFLAG_INHASH;
+ break;
+ }
+ }
+ osi_assertx(tscp, "afsd: scache hash screwup");
+ }
+
+ if (flags & CM_SCACHE_RECYCLEFLAG_DESTROY_BUFFERS) {
+ osi_queueData_t *qdp;
+ cm_buf_t *bufp;
+
+ while(qdp = scp->bufWritesp) {
+ bufp = osi_GetQData(qdp);
+ osi_QRemove((osi_queue_t **) &scp->bufWritesp, &qdp->q);
+ osi_QDFree(qdp);
+ if (bufp) {
+ lock_ObtainMutex(&bufp->mx);
+ bufp->cmFlags &= ~CM_BUF_CMSTORING;
+ bufp->flags &= ~CM_BUF_DIRTY;
+ bufp->dataVersion = -1; /* bad */
+ bufp->dirtyCounter++;
+ if (bufp->flags & CM_BUF_WAITING) {
+ osi_Log2(afsd_logp, "CM RecycleSCache Waking [scp 0x%x] bufp 0x%x", scp, bufp);
+ osi_Wakeup((long) &bufp);
+ }
+ lock_ReleaseMutex(&bufp->mx);
+ buf_Release(bufp);
+ }
}
-
- if (scp) {
- /* we found an entry, so return it */
- if (scp->flags & CM_SCACHEFLAG_INHASH) {
- /* hash it out first */
- i = CM_SCACHE_HASH(&scp->fid);
- lscpp = &cm_hashTablep[i];
- for (tscp = *lscpp;
- tscp;
- lscpp = &tscp->nextp, tscp = *lscpp) {
- if (tscp == scp)
- break;
- }
- osi_assertx(tscp, "afsd: scache hash screwup");
- *lscpp = scp->nextp;
- scp->flags &= ~CM_SCACHEFLAG_INHASH;
- }
+ while(qdp = scp->bufReadsp) {
+ bufp = osi_GetQData(qdp);
+ osi_QRemove((osi_queue_t **) &scp->bufReadsp, &qdp->q);
+ osi_QDFree(qdp);
+ if (bufp) {
+ lock_ObtainMutex(&bufp->mx);
+ bufp->cmFlags &= ~CM_BUF_CMFETCHING;
+ bufp->flags &= ~CM_BUF_DIRTY;
+ bufp->dataVersion = -1; /* bad */
+ bufp->dirtyCounter++;
+ if (bufp->flags & CM_BUF_WAITING) {
+ osi_Log2(afsd_logp, "CM RecycleSCache Waking [scp 0x%x] bufp 0x%x", scp, bufp);
+ osi_Wakeup((long) &bufp);
+ }
+ lock_ReleaseMutex(&bufp->mx);
+ buf_Release(bufp);
+ }
+ }
+ } else {
+ /* look for things that shouldn't still be set */
+ osi_assert(scp->bufWritesp == NULL);
+ osi_assert(scp->bufReadsp == NULL);
+ }
- /* look for things that shouldn't still be set */
- osi_assert(scp->bufWritesp == NULL);
- osi_assert(scp->bufReadsp == NULL);
-
- /* invalidate so next merge works fine;
- * also initialize some flags */
- scp->flags &= ~(CM_SCACHEFLAG_STATD
- | CM_SCACHEFLAG_RO
- | CM_SCACHEFLAG_PURERO
- | CM_SCACHEFLAG_OVERQUOTA
- | CM_SCACHEFLAG_OUTOFSPACE);
- scp->serverModTime = 0;
- scp->dataVersion = 0;
- scp->bulkStatProgress = hzero;
-
- /* discard callback */
- if (scp->cbServerp) {
- cm_PutServer(scp->cbServerp);
- scp->cbServerp = NULL;
- }
- scp->cbExpires = 0;
+ /* invalidate so next merge works fine;
+ * also initialize some flags */
+ scp->flags &= ~(CM_SCACHEFLAG_STATD
+ | CM_SCACHEFLAG_RO
+ | CM_SCACHEFLAG_PURERO
+ | CM_SCACHEFLAG_OVERQUOTA
+ | CM_SCACHEFLAG_OUTOFSPACE);
+ scp->serverModTime = 0;
+ scp->dataVersion = 0;
+ 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);
+ /* remove from dnlc */
+ cm_dnlcPurgedp(scp);
+ cm_dnlcPurgevp(scp);
- /* discard cached status; if non-zero, Close
- * tried to store this to server but failed */
- scp->mask = 0;
+ /* discard cached status; if non-zero, Close
+ * 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;
- }
+ /* drop held volume ref */
+ if (scp->volp) {
+ cm_PutVolume(scp->volp);
+ scp->volp = NULL;
+ }
- /* discard symlink info */
- if (scp->mountPointStringp) {
- free(scp->mountPointStringp);
- scp->mountPointStringp = NULL;
- }
- if (scp->mountRootFidp) {
- free(scp->mountRootFidp);
- scp->mountRootFidp = NULL;
- }
- if (scp->dotdotFidp) {
- free(scp->dotdotFidp);
- scp->dotdotFidp = NULL;
- }
+ /* discard symlink info */
+ scp->mountPointStringp[0] = 0;
+ memset(&scp->mountRootFid, 0, sizeof(cm_fid_t));
+ memset(&scp->dotdotFid, 0, sizeof(cm_fid_t));
- /* not locked, but there can be no references to this guy
- * while we hold the global refcount lock.
- */
- cm_FreeAllACLEnts(scp);
+ /* reset locking info */
+ scp->fileLocksH = NULL;
+ scp->fileLocksT = NULL;
+ scp->serverLock = (-1);
+ scp->exclusiveLocks = 0;
+ scp->sharedLocks = 0;
- /* now remove from the LRU queue and put it back at the
- * head of the LRU queue.
- */
- cm_AdjustLRU(scp);
+ /* not locked, but there can be no references to this guy
+ * while we hold the global refcount lock.
+ */
+ cm_FreeAllACLEnts(scp);
- /* and we're done */
- return scp;
+ return 0;
+}
+
+
+/* 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).
+ */
+cm_scache_t *cm_GetNewSCache(void)
+{
+ cm_scache_t *scp;
+
+ start:
+ if (cm_data.currentSCaches >= cm_data.maxSCaches) {
+ for (scp = cm_data.scacheLRULastp;
+ scp;
+ scp = (cm_scache_t *) osi_QPrev(&scp->q)) {
+ if (scp->refCount == 0)
+ break;
+ }
+
+ if (scp) {
+ osi_assert(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.hashTablep);
+
+ 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 {
+ /* We don't like this entry, choose another one. */
+ goto start;
+ }
}
}
/* 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 = malloc(sizeof(*scp));
- memset(scp, 0, sizeof(*scp));
+ 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");
lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock");
+ scp->serverLock = -1;
/* and put it in the LRU queue */
- osi_QAdd((osi_queue_t **) &cm_scacheLRUFirstp, &scp->q);
- if (!cm_scacheLRULastp)
- cm_scacheLRULastp = scp;
- cm_currentSCaches++;
+ osi_QAdd((osi_queue_t **) &cm_data.scacheLRUFirstp, &scp->q);
+ if (!cm_data.scacheLRULastp)
+ cm_data.scacheLRULastp = scp;
+ cm_data.currentSCaches++;
cm_dnlcPurgedp(scp); /* make doubly sure that this is not in dnlc */
cm_dnlcPurgevp(scp);
return scp;
return 0;
}
-void cm_fakeSCacheInit()
+void cm_fakeSCacheInit(int newFile)
{
- memset(&cm_fakeSCache, 0, sizeof(cm_fakeSCache));
- lock_InitializeMutex(&cm_fakeSCache.mx, "cm_scache_t mutex");
- cm_fakeSCache.cbServerp = (struct cm_server *)(-1);
- /* can leave clientModTime at 0 */
- cm_fakeSCache.fileType = CM_SCACHETYPE_FILE;
- cm_fakeSCache.unixModeBits = 0777;
- cm_fakeSCache.length.LowPart = 1000;
- cm_fakeSCache.linkCount = 1;
-}
+ if ( newFile ) {
+ memset(&cm_data.fakeSCache, 0, sizeof(cm_scache_t));
+ cm_data.fakeSCache.cbServerp = (struct cm_server *)(-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;
+ }
+ lock_InitializeMutex(&cm_data.fakeSCache.mx, "cm_scache_t mutex");
+}
+
+long
+cm_ValidateSCache(void)
+{
+ cm_scache_t * scp, *lscp;
+ long i;
+
+ if ( cm_data.scacheLRUFirstp == NULL && cm_data.scacheLRULastp != NULL ||
+ cm_data.scacheLRUFirstp != NULL && cm_data.scacheLRULastp == NULL) {
+ afsi_log("cm_ValidateSCache failure: inconsistent LRU pointers");
+ fprintf(stderr, "cm_ValidateSCache failure: inconsistent LRU pointers\n");
+ return -17;
+ }
+
+ for ( scp = cm_data.scacheLRUFirstp, lscp = NULL, i = 0;
+ scp;
+ lscp = scp, scp = (cm_scache_t *) osi_QNext(&scp->q), i++ ) {
+ 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");
+ return -1;
+ }
+ if (scp->nextp && scp->nextp->magic != CM_SCACHE_MAGIC) {
+ afsi_log("cm_ValidateSCache failure: scp->nextp->magic != CM_SCACHE_MAGIC");
+ fprintf(stderr, "cm_ValidateSCache failure: scp->nextp->magic != CM_SCACHE_MAGIC\n");
+ return -2;
+ }
+ if (scp->randomACLp && scp->randomACLp->magic != CM_ACLENT_MAGIC) {
+ afsi_log("cm_ValidateSCache failure: scp->randomACLp->magic != CM_ACLENT_MAGIC");
+ 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");
+ return -13;
+ }
+ if (lscp != (cm_scache_t *) osi_QPrev(&scp->q)) {
+ afsi_log("cm_ValidateSCache failure: QPrev(scp) != previous");
+ fprintf(stderr, "cm_ValidateSCache failure: QPrev(scp) != previous\n");
+ return -15;
+ }
+ }
+
+ for ( scp = cm_data.scacheLRULastp, lscp = NULL, i = 0; scp;
+ lscp = scp, scp = (cm_scache_t *) osi_QPrev(&scp->q), i++ ) {
+ 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");
+ return -5;
+ }
+ if (scp->nextp && scp->nextp->magic != CM_SCACHE_MAGIC) {
+ afsi_log("cm_ValidateSCache failure: scp->nextp->magic != CM_SCACHE_MAGIC");
+ fprintf(stderr, "cm_ValidateSCache failure: scp->nextp->magic != CM_SCACHE_MAGIC\n");
+ return -6;
+ }
+ if (scp->randomACLp && scp->randomACLp->magic != CM_ACLENT_MAGIC) {
+ afsi_log("cm_ValidateSCache failure: scp->randomACLp->magic != CM_ACLENT_MAGIC");
+ 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");
+ return -14;
+ }
+ if (lscp != (cm_scache_t *) osi_QNext(&scp->q)) {
+ afsi_log("cm_ValidateSCache failure: QNext(scp) != next");
+ fprintf(stderr, "cm_ValidateSCache failure: QNext(scp) != next\n");
+ return -16;
+ }
+ }
+
+ 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");
+ return -9;
+ }
+ if (scp->nextp && scp->nextp->magic != CM_SCACHE_MAGIC) {
+ afsi_log("cm_ValidateSCache failure: scp->nextp->magic != CM_SCACHE_MAGIC");
+ fprintf(stderr, "cm_ValidateSCache failure: scp->nextp->magic != CM_SCACHE_MAGIC\n");
+ return -10;
+ }
+ if (scp->randomACLp && scp->randomACLp->magic != CM_ACLENT_MAGIC) {
+ afsi_log("cm_ValidateSCache failure: scp->randomACLp->magic != CM_ACLENT_MAGIC");
+ 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;
+ }
+ }
+ }
+
+ 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();
+}
-void cm_InitSCache(long maxSCaches)
+void cm_InitSCache(int newFile, long maxSCaches)
{
static osi_once_t once;
if (osi_Once(&once)) {
lock_InitializeRWLock(&cm_scacheLock, "cm_scacheLock");
- cm_hashTableSize = maxSCaches / 2;
- cm_hashTablep = malloc(sizeof(cm_scache_t *) * cm_hashTableSize);
- memset(cm_hashTablep, 0, sizeof(cm_scache_t *) * cm_hashTableSize);
+ 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");
+
+ scp->cbServerp = NULL;
+ scp->cbExpires = 0;
+ scp->fileLocksH = NULL;
+ scp->fileLocksT = NULL;
+ scp->serverLock = (-1);
+ scp->lastRefreshCycle = 0;
+ scp->exclusiveLocks = 0;
+ scp->sharedLocks = 0;
+ scp->openReads = 0;
+ scp->openWrites = 0;
+ scp->openShares = 0;
+ scp->openExcls = 0;
+ scp->waitCount = 0;
+ scp->flags &= ~CM_SCACHEFLAG_WAITING;
+ }
+ }
cm_allFileLocks = NULL;
- cm_currentSCaches = 0;
- cm_maxSCaches = maxSCaches;
- cm_fakeSCacheInit();
- cm_dnlcInit();
+ cm_freeFileLocks = NULL;
+ cm_lockRefreshCycle = 0;
+ cm_fakeSCacheInit(newFile);
+ cm_dnlcInit(newFile);
osi_EndOnce(&once);
}
}
osi_assert(fidp->cell != 0);
lock_ObtainWrite(&cm_scacheLock);
- for(scp=cm_hashTablep[hash]; scp; scp=scp->nextp) {
+ for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) {
if (cm_FidCmp(fidp, &scp->fid) == 0) {
cm_HoldSCacheNoLock(scp);
cm_AdjustLRU(scp);
osi_assert(fidp->cell != 0);
- if (fidp->cell== cm_rootFid.cell &&
- fidp->volume==cm_rootFid.volume &&
+ 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");
// yj: check if we have the scp, if so, we don't need
// to do anything else
lock_ObtainWrite(&cm_scacheLock);
- for (scp=cm_hashTablep[hash]; scp; scp=scp->nextp) {
+ for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) {
if (cm_FidCmp(fidp, &scp->fid) == 0) {
cm_HoldSCacheNoLock(scp);
*outScpp = scp;
if (cm_freelanceEnabled && special) {
osi_Log0(afsd_logp,"cm_getSCache Freelance and special");
- if (fidp->vnode > 1) {
+ 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);
mp = "";
}
scp = cm_GetNewSCache();
-
+
+ lock_ObtainMutex(&scp->mx);
scp->fid = *fidp;
- scp->volp = cm_rootSCachep->volp;
- if (scp->dotdotFidp == (cm_fid_t *) NULL)
- scp->dotdotFidp = (cm_fid_t *) malloc (sizeof(cm_fid_t));
- scp->dotdotFidp->cell=AFS_FAKE_ROOT_CELL_ID;
- scp->dotdotFidp->volume=AFS_FAKE_ROOT_VOL_ID;
- scp->dotdotFidp->unique=1;
- scp->dotdotFidp->vnode=1;
+ scp->volp = cm_data.rootSCachep->volp;
+ 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_hashTablep[hash];
- cm_hashTablep[hash]=scp;
+ scp->nextp=cm_data.hashTablep[hash];
+ cm_data.hashTablep[hash]=scp;
scp->flags |= CM_SCACHEFLAG_INHASH;
scp->refCount = 1;
- scp->fileType = (cm_localMountPoints+fidp->vnode-2)->fileType;
+ 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->length.LowPart = strlen(mp)+4;
- scp->mountPointStringp=malloc(strlen(mp)+1);
- strcpy(scp->mountPointStringp,mp);
+ 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->parentUnique = 0x1;
scp->parentVnode=0x1;
scp->group=0;
- scp->dataVersion=0x8;
+ scp->dataVersion=cm_data.fakeDirVersion;
+ scp->lockDataVersion=-1; /* no lock yet */
+ lock_ReleaseMutex(&scp->mx);
*outScpp = scp;
lock_ReleaseWrite(&cm_scacheLock);
- /*afsi_log(" getscache done");*/
return 0;
}
// end of yj code
/* otherwise, we have the volume, now reverify that the scp doesn't
* exist, and proceed.
*/
- for (scp=cm_hashTablep[hash]; scp; scp=scp->nextp) {
+ for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) {
if (cm_FidCmp(fidp, &scp->fid) == 0) {
- osi_assert(scp->volp == volp);
cm_HoldSCacheNoLock(scp);
+ osi_assert(scp->volp == volp);
cm_AdjustLRU(scp);
lock_ReleaseWrite(&cm_scacheLock);
if (volp)
/* now, if we don't have the fid, recycle something */
scp = cm_GetNewSCache();
osi_assert(!(scp->flags & CM_SCACHEFLAG_INHASH));
+ lock_ObtainMutex(&scp->mx);
scp->fid = *fidp;
scp->volp = volp; /* a held reference */
* 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 && volp->dotdotFidp) {
- if (scp->dotdotFidp == (cm_fid_t *) NULL)
- scp->dotdotFidp = (cm_fid_t *) malloc(sizeof(cm_fid_t));
- *(scp->dotdotFidp) = *volp->dotdotFidp;
+ if (scp->fid.vnode == 1 && scp->fid.unique == 1) {
+ scp->dotdotFid = volp->dotdotFid;
}
if (volp->roID == fidp->volume)
else if (volp->bkID == fidp->volume)
scp->flags |= CM_SCACHEFLAG_RO;
}
- scp->nextp = cm_hashTablep[hash];
- cm_hashTablep[hash] = scp;
+ scp->nextp = cm_data.hashTablep[hash];
+ cm_data.hashTablep[hash] = scp;
scp->flags |= CM_SCACHEFLAG_INHASH;
scp->refCount = 1;
+ lock_ReleaseMutex(&scp->mx);
/* XXX - The following fields in the cm_scache are
* uninitialized:
return 0;
}
+/* Returns a held reference to the scache's parent
+ * if it exists */
+cm_scache_t * cm_FindSCacheParent(cm_scache_t * scp)
+{
+ long code = 0;
+ int i;
+ cm_fid_t parent_fid;
+ cm_scache_t * pscp = NULL;
+
+ lock_ObtainWrite(&cm_scacheLock);
+ parent_fid = scp->fid;
+ parent_fid.vnode = scp->parentVnode;
+ parent_fid.unique = scp->parentUnique;
+
+ if (cm_FidCmp(&scp->fid, &parent_fid)) {
+ for (i=0; i<cm_data.hashTableSize; i++) {
+ for (pscp = cm_data.hashTablep[i]; pscp; pscp = pscp->nextp) {
+ if (!cm_FidCmp(&pscp->fid, &parent_fid)) {
+ cm_HoldSCacheNoLock(pscp);
+ break;
+ }
+ }
+ }
+ }
+ lock_ReleaseWrite(&cm_scacheLock);
+
+ return pscp;
+}
+
/* synchronize a fetch, store, read, write, fetch status or store status.
* Called with scache mutex held, and returns with it held, but temporarily
* drops it during the fetch.
* is to serialize all StoreData RPC's. This is the reason we defined
* CM_SCACHESYNC_STOREDATA_EXCL and CM_SCACHEFLAG_DATASTORING.
*/
-long cm_SyncOp(cm_scache_t *scp, cm_buf_t *bufp, cm_user_t *up, cm_req_t *reqp,
- long rights, long flags)
+long cm_SyncOp(cm_scache_t *scp, cm_buf_t *bufp, cm_user_t *userp, cm_req_t *reqp,
+ afs_uint32 rights, afs_uint32 flags)
{
osi_queueData_t *qdp;
long code;
cm_buf_t *tbufp;
- long outRights;
+ afs_uint32 outRights;
int bufLocked;
/* lookup this first */
* a write occurred in.
*/
if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING
- | CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK))
+ | CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING|GETCALLBACK want FETCHSTATUS", scp);
goto sleep;
+ }
}
if (flags & (CM_SCACHESYNC_STORESIZE | CM_SCACHESYNC_STORESTATUS
| CM_SCACHESYNC_SETSIZE | CM_SCACHESYNC_GETCALLBACK)) {
/* if we're going to make an RPC to change the status, make sure
* that no one is bringing in or sending out the status.
*/
- if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING
- | CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK))
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING |
+ CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING|GETCALLBACK want STORESIZE|STORESTATUS|SETSIZE|GETCALLBACK", scp);
+ goto sleep;
+ }
+ if (scp->bufReadsp || scp->bufWritesp) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is bufRead|bufWrite want STORESIZE|STORESTATUS|SETSIZE|GETCALLBACK", scp);
goto sleep;
- if (scp->bufReadsp || scp->bufWritesp) goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_FETCHDATA) {
/* if we're bringing in a new chunk of data, make sure that
* changing the basic file status info, either.
*/
if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING
- | CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK))
+ | CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING|GETCALLBACK want FETCHDATA", scp);
goto sleep;
- if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING)))
+ }
+ if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING))) {
+ osi_Log2(afsd_logp, "CM SyncOp scp 0x%p bufp 0x%p is BUF_CMFETCHING|BUF_CMSTORING want FETCHDATA", scp, bufp);
goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_STOREDATA) {
/* same as fetch data */
if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING
- | CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK))
+ | CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING|GETCALLBACK want STOREDATA", scp);
goto sleep;
- if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING)))
+ }
+ if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING))) {
+ osi_Log2(afsd_logp, "CM SyncOp scp 0x%p bufp 0x%p is BUF_CMFETCHING|BUF_CMSTORING want STOREDATA", scp, bufp);
goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_STOREDATA_EXCL) {
/* Don't allow concurrent StoreData RPC's */
- if (scp->flags & CM_SCACHEFLAG_DATASTORING)
+ if (scp->flags & CM_SCACHEFLAG_DATASTORING) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is DATASTORING want STOREDATA_EXCL", scp);
goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_ASYNCSTORE) {
/* Don't allow more than one BKG store request */
- if (scp->flags & CM_SCACHEFLAG_ASYNCSTORING)
+ if (scp->flags & CM_SCACHEFLAG_ASYNCSTORING) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is ASYNCSTORING want ASYNCSTORE", scp);
goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_LOCK) {
/* Don't allow concurrent fiddling with lock lists */
- if (scp->flags & CM_SCACHEFLAG_LOCKING)
+ if (scp->flags & CM_SCACHEFLAG_LOCKING) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is LOCKING want LOCK", scp);
goto sleep;
+ }
}
/* now the operations that don't correspond to making RPCs */
/* we can use the status that's here, if we're not
* bringing in new status.
*/
- if (scp->flags & (CM_SCACHEFLAG_FETCHING))
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING want GETSTATUS", scp);
goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_SETSTATUS) {
/* we can make a change to the local status, as long as
* operations don't change any of the data that we're
* changing here.
*/
- if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING
- | CM_SCACHEFLAG_SIZESTORING))
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING | CM_SCACHEFLAG_SIZESTORING)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING want SETSTATUS", scp);
goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_READ) {
/* we're going to read the data, make sure that the
* status is available, and that the data is here. It
* is OK to read while storing the data back.
*/
- if (scp->flags & CM_SCACHEFLAG_FETCHING)
+ if (scp->flags & CM_SCACHEFLAG_FETCHING) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING want READ", scp);
goto sleep;
- if (bufp && ((bufp->cmFlags
- & (CM_BUF_CMFETCHING
- | CM_BUF_CMFULLYFETCHED))
- == CM_BUF_CMFETCHING))
+ }
+ if (bufp && ((bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMFULLYFETCHED)) == CM_BUF_CMFETCHING)) {
+ osi_Log2(afsd_logp, "CM SyncOp scp 0x%p bufp 0x%p is BUF_CMFETCHING want READ", scp, bufp);
goto sleep;
+ }
}
if (flags & CM_SCACHESYNC_WRITE) {
/* don't write unless the status is stable and the chunk
* is stable.
*/
if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING
- | CM_SCACHEFLAG_SIZESTORING))
+ | CM_SCACHEFLAG_SIZESTORING)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING want WRITE", scp);
goto sleep;
- if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING)))
+ }
+ if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING))) {
+ osi_Log2(afsd_logp, "CM SyncOp scp 0x%p bufp 0x%p is BUF_CMFETCHING|BUF_CMSTORING want WRITE", scp, bufp);
goto sleep;
+ }
}
// yj: modified this so that callback only checked if we're
#endif /* AFS_FREELANCE_CLIENT */
) {
if (!cm_HaveCallback(scp)) {
- osi_Log1(afsd_logp, "CM SyncOp getting callback on scp %x",
- (long) scp);
- if (bufLocked) lock_ReleaseMutex(&bufp->mx);
- code = cm_GetCallback(scp, up, reqp, 0);
+ osi_Log1(afsd_logp, "CM SyncOp getting callback on scp 0x%p",
+ scp);
+ if (bufLocked)
+ lock_ReleaseMutex(&bufp->mx);
+ code = cm_GetCallback(scp, userp, reqp, 0);
if (bufLocked) {
lock_ReleaseMutex(&scp->mx);
lock_ObtainMutex(&bufp->mx);
lock_ObtainMutex(&scp->mx);
}
- if (code) return code;
+ if (code)
+ return code;
continue;
}
}
if ((rights & PRSFS_WRITE) && (scp->flags & CM_SCACHEFLAG_RO))
return CM_ERROR_READONLY;
- if (cm_HaveAccessRights(scp, up, rights, &outRights)) {
- if (~outRights & rights) return CM_ERROR_NOACCESS;
+ if (cm_HaveAccessRights(scp, userp, rights, &outRights)) {
+ if (~outRights & rights)
+ return CM_ERROR_NOACCESS;
}
else {
/* we don't know the required access rights */
if (bufLocked) lock_ReleaseMutex(&bufp->mx);
- code = cm_GetAccessRights(scp, up, reqp);
- if (code) return code;
+ code = cm_GetAccessRights(scp, userp, reqp);
if (bufLocked) {
lock_ReleaseMutex(&scp->mx);
lock_ObtainMutex(&bufp->mx);
lock_ObtainMutex(&scp->mx);
}
+ if (code)
+ return code;
continue;
}
}
/* first check if we're not supposed to wait: fail
* in this case, returning with everything still locked.
*/
- if (flags & CM_SCACHESYNC_NOWAIT) return CM_ERROR_WOULDBLOCK;
+ if (flags & CM_SCACHESYNC_NOWAIT)
+ return CM_ERROR_WOULDBLOCK;
/* wait here, then try again */
- osi_Log1(afsd_logp, "CM SyncOp sleeping scp %x", (long) scp);
- if ( scp->flags & CM_SCACHEFLAG_WAITING )
- osi_Log1(afsd_logp, "CM SyncOp CM_SCACHEFLAG_WAITING already set for 0x%x", scp);
- else
- osi_Log1(afsd_logp, "CM SyncOp CM_SCACHEFLAG_WAITING set for 0x%x", scp);
- scp->flags |= CM_SCACHEFLAG_WAITING;
- if (bufLocked) lock_ReleaseMutex(&bufp->mx);
- osi_SleepM((long) &scp->flags, &scp->mx);
- osi_Log0(afsd_logp, "CM SyncOp woke!");
+ osi_Log1(afsd_logp, "CM SyncOp sleeping scp 0x%p", scp);
+ if ( scp->flags & CM_SCACHEFLAG_WAITING ) {
+ scp->waitCount++;
+ scp->waitRequests++;
+ osi_Log3(afsd_logp, "CM SyncOp CM_SCACHEFLAG_WAITING already set for 0x%p; %d threads; %d requests",
+ scp, scp->waitCount, scp->waitRequests);
+ } else {
+ osi_Log1(afsd_logp, "CM SyncOp CM_SCACHEFLAG_WAITING set for 0x%p", scp);
+ scp->flags |= CM_SCACHEFLAG_WAITING;
+ scp->waitCount = scp->waitRequests = 1;
+ }
+ if (bufLocked)
+ lock_ReleaseMutex(&bufp->mx);
+ osi_SleepM((LONG_PTR) &scp->flags, &scp->mx);
+
+ 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 (scp->waitCount == 0) {
+ osi_Log1(afsd_logp, "CM SyncOp CM_SCACHEFLAG_WAITING reset for 0x%p", scp);
+ scp->flags &= ~CM_SCACHEFLAG_WAITING;
+ scp->waitRequests = 0;
+ }
} /* big while loop */
/* now, update the recorded state for RPC-type calls */
/* for those syncops that setup for RPCs.
* Called with scache locked.
*/
-void cm_SyncOpDone(cm_scache_t *scp, cm_buf_t *bufp, long flags)
+void cm_SyncOpDone(cm_scache_t *scp, cm_buf_t *bufp, afs_uint32 flags)
{
osi_queueData_t *qdp;
cm_buf_t *tbufp;
osi_QRemove((osi_queue_t **) &scp->bufReadsp, &qdp->q);
osi_QDFree(qdp);
if (bufp) {
- bufp->cmFlags &=
- ~(CM_BUF_CMFETCHING | CM_BUF_CMFULLYFETCHED);
+ bufp->cmFlags &= ~(CM_BUF_CMFETCHING | CM_BUF_CMFULLYFETCHED);
+ if (bufp->flags & CM_BUF_WAITING) {
+ osi_Log2(afsd_logp, "CM SyncOpDone Waking [scp 0x%p] bufp 0x%p", scp, bufp);
+ osi_Wakeup((LONG_PTR) &bufp);
+ }
buf_Release(bufp);
}
}
osi_QDFree(qdp);
if (bufp) {
bufp->cmFlags &= ~CM_BUF_CMSTORING;
+ if (bufp->flags & CM_BUF_WAITING) {
+ osi_Log2(afsd_logp, "CM SyncOpDone Waking [scp 0x%p] bufp 0x%p", scp, bufp);
+ osi_Wakeup((LONG_PTR) &bufp);
+ }
buf_Release(bufp);
}
}
/* and wakeup anyone who is waiting */
if (scp->flags & CM_SCACHEFLAG_WAITING) {
- osi_Log1(afsd_logp, "CM SyncOp CM_SCACHEFLAG_WAITING reset for 0x%x", scp);
- scp->flags &= ~CM_SCACHEFLAG_WAITING;
- osi_Wakeup((long) &scp->flags);
+ osi_Log1(afsd_logp, "CM SyncOpDone Waking scp 0x%p", scp);
+ osi_Wakeup((LONG_PTR) &scp->flags);
}
}
* started before that, can cause old info to be merged from the first call.
*/
void cm_MergeStatus(cm_scache_t *scp, AFSFetchStatus *statusp, AFSVolSync *volp,
- cm_user_t *userp, int flags)
+ cm_user_t *userp, afs_uint32 flags)
{
// 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_rootSCachep) {
- osi_Log0(afsd_logp,"cm_MergeStatus Freelance cm_rootSCachep");
+ if (cm_freelanceEnabled && scp == cm_data.rootSCachep) {
+ osi_Log0(afsd_logp,"cm_MergeStatus Freelance cm_data.rootSCachep");
statusp->InterfaceVersion = 0x1;
statusp->FileType = CM_SCACHETYPE_DIRECTORY;
statusp->LinkCount = scp->linkCount;
statusp->Length = cm_fakeDirSize;
- statusp->DataVersion = scp->dataVersion;
+ statusp->Length_hi = 0;
+ statusp->DataVersion = cm_data.fakeDirVersion;
statusp->Author = 0x1;
statusp->Owner = 0x0;
statusp->CallerAccess = 0x9;
statusp->Group = 0;
statusp->SyncCounter = 0;
statusp->dataVersionHigh = 0;
+ statusp->errorCode = 0;
}
#endif /* AFS_FREELANCE_CLIENT */
+ if (statusp->errorCode != 0) {
+ scp->flags |= CM_SCACHEFLAG_EACCESS;
+ osi_Log2(afsd_logp, "Merge, Failure scp %x code 0x%x", scp, statusp->errorCode);
+ return;
+ } else {
+ scp->flags &= ~CM_SCACHEFLAG_EACCESS;
+ }
+
if (!(flags & CM_MERGEFLAG_FORCE)
&& statusp->DataVersion < (unsigned long) scp->dataVersion) {
struct cm_cell *cellp;
- struct cm_volume *volp;
cellp = cm_FindCellByID(scp->fid.cell);
- cm_GetVolumeByID(cellp, scp->fid.volume, userp,
- (cm_req_t *) NULL, &volp);
- if (scp->cbServerp)
+ if (scp->cbServerp) {
+ 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->namep);
+ volp ? volp->namep : "(unknown)");
+ if (volp)
+ cm_PutVolume(volp);
+ }
osi_Log3(afsd_logp, "Bad merge, scp %x, scp dv %d, RPC dv %d",
scp, scp->dataVersion, statusp->DataVersion);
/* we have a number of data fetch/store operations running
}
if (!(scp->mask & CM_SCACHEMASK_LENGTH)) {
scp->length.LowPart = statusp->Length;
- scp->length.HighPart = 0;
+ scp->length.HighPart = statusp->Length_hi;
}
scp->serverLength.LowPart = statusp->Length;
- scp->serverLength.HighPart = 0;
+ scp->serverLength.HighPart = statusp->Length_hi;
scp->linkCount = statusp->LinkCount;
scp->dataVersion = statusp->DataVersion;
scp->fileType = CM_SCACHETYPE_SYMLINK;
}
else {
- osi_Log1(afsd_logp, "Merge, Invalid File Type, scp %x", scp);
- scp->fileType = 0; /* invalid */
+ osi_Log2(afsd_logp, "Merge, Invalid File Type (%d), scp %x", statusp->FileType, scp);
+ scp->fileType = CM_SCACHETYPE_INVALID; /* invalid */
}
/* and other stuff */
scp->parentVnode = statusp->ParentVnode;
scp->cbServerp = NULL;
}
scp->cbExpires = 0;
+ scp->flags &= ~CM_SCACHEFLAG_CALLBACK;
cm_dnlcPurgedp(scp);
+ cm_dnlcPurgevp(scp);
cm_FreeAllACLEnts(scp);
+
+ /* Force mount points and symlinks to be re-evaluated */
+ scp->mountPointStringp[0] = '\0';
}
void cm_AFSFidFromFid(AFSFid *afsFidp, cm_fid_t *fidp)
void cm_HoldSCacheNoLock(cm_scache_t *scp)
{
-#ifdef NOLOCK_ASSERT
+ osi_assert(scp != 0);
osi_assert(scp->refCount >= 0);
-#endif
scp->refCount++;
}
void cm_HoldSCache(cm_scache_t *scp)
{
+ osi_assert(scp != 0);
lock_ObtainWrite(&cm_scacheLock);
osi_assert(scp->refCount >= 0);
scp->refCount++;
void cm_ReleaseSCacheNoLock(cm_scache_t *scp)
{
- osi_assert(scp->refCount-- > 0);
+ osi_assert(scp != 0);
+ osi_assert(scp->refCount-- >= 0);
}
void cm_ReleaseSCache(cm_scache_t *scp)
{
+ osi_assert(scp != 0);
lock_ObtainWrite(&cm_scacheLock);
- osi_assert(scp->refCount-- > 0);
+ osi_assert(scp->refCount != 0);
+ scp->refCount--;
lock_ReleaseWrite(&cm_scacheLock);
}
osi_assert(fidp->cell != 0);
lock_ObtainWrite(&cm_scacheLock);
- for (scp=cm_hashTablep[hash]; scp; scp=scp->nextp) {
+ for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) {
if (cm_FidCmp(fidp, &scp->fid) == 0) {
lock_ReleaseWrite(&cm_scacheLock);
return scp->fileType;
* cookie is used to identify this batch for easy parsing,
* and it a string provided by a caller
*/
-int cm_DumpSCache(FILE *outputFile, char *cookie)
+int cm_DumpSCache(FILE *outputFile, char *cookie, int lock)
{
int zilch;
cm_scache_t *scp;
char output[1024];
int i;
- lock_ObtainRead(&cm_scacheLock);
+ if (lock)
+ lock_ObtainRead(&cm_scacheLock);
- sprintf(output, "%s - dumping scache - cm_currentSCaches=%d, cm_maxSCaches=%d\n", cookie, cm_currentSCaches, cm_maxSCaches);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
+ sprintf(output, "%s - dumping scache - cm_data.currentSCaches=%d, cm_data.maxSCaches=%d\n", cookie, cm_data.currentSCaches, cm_data.maxSCaches);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
- for (scp = cm_scacheLRULastp; scp; scp = (cm_scache_t *) osi_QPrev(&scp->q))
+ for (scp = cm_data.scacheLRULastp; scp; scp = (cm_scache_t *) osi_QPrev(&scp->q))
{
- if (scp->refCount > 0)
+ if (scp->refCount != 0)
{
sprintf(output, "%s fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\n",
cookie, scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique,
scp->refCount);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
}
}
- sprintf(output, "%s - dumping cm_hashTable - cm_hashTableSize=%d\n", cookie, cm_hashTableSize);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
+ sprintf(output, "%s - dumping cm_data.hashTable - cm_data.hashTableSize=%d\n", cookie, cm_data.hashTableSize);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
- for (i = 0; i < cm_hashTableSize; i++)
+ for (i = 0; i < cm_data.hashTableSize; i++)
{
- for(scp = cm_hashTablep[i]; scp; scp=scp->nextp)
+ for(scp = cm_data.hashTablep[i]; scp; scp=scp->nextp)
{
- if (scp)
+ if (scp->refCount != 0)
{
- if (scp->refCount > 0)
- {
- sprintf(output, "%s scp=0x%08X, hash=%d, fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\n",
- cookie, (void *)scp, i, scp->fid.cell, scp->fid.volume, scp->fid.vnode,
- scp->fid.unique, scp->refCount);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
- }
+ sprintf(output, "%s scp=0x%p, hash=%d, fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\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.\n", cookie);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
- lock_ReleaseRead(&cm_scacheLock);
+ if (lock)
+ lock_ReleaseRead(&cm_scacheLock);
return (0);
}
git://git.openafs.org / openafs.git / blobdiff