extern osi_mutex_t cm_Freelance_Lock;
#endif
+cm_scache_t *
+cm_RootSCachep(cm_user_t *userp, cm_req_t *reqp)
+{
+ afs_int32 code;
+
+ lock_ObtainWrite(&cm_data.rootSCachep->rw);
+ code = cm_SyncOp(cm_data.rootSCachep, NULL, userp, reqp, 0,
+ CM_SCACHESYNC_GETSTATUS | CM_SCACHESYNC_NEEDCALLBACK);
+ if (!code)
+ cm_SyncOpDone(cm_data.rootSCachep, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
+ lock_ReleaseWrite(&cm_data.rootSCachep->rw);
+
+ return cm_data.rootSCachep;
+}
+
+
/* must be called with cm_scacheLock write-locked! */
void cm_AdjustScacheLRU(cm_scache_t *scp)
{
}
}
-/* 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) {
return -1;
}
- lock_ObtainWrite(&scp->rw);
cm_RemoveSCacheFromHashTable(scp);
- lock_ReleaseWrite(&scp->rw);
#if 0
if (flags & CM_SCACHE_RECYCLEFLAG_DESTROY_BUFFERS) {
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);
-#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)
{
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_InitializeRWLock(&scp->rw, "cm_scache_t rw");
- 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;
{
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_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
for ( scp = cm_data.allSCachesp; scp;
scp = scp->allNextp ) {
if (scp->randomACLp) {
+ lock_ReleaseWrite(&cm_scacheLock);
lock_ObtainWrite(&scp->rw);
+ lock_ObtainWrite(&cm_scacheLock);
cm_FreeAllACLEnts(scp);
lock_ReleaseWrite(&scp->rw);
}
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);
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_InitializeRWLock(&scp->rw, "cm_scache_t rw");
- 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->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 &&
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 &&
}
if (cm_freelanceEnabled && special) {
- char mp[MOUNTPOINTLEN] = "";
- afs_uint32 fileType;
-
+ lock_ReleaseWrite(&cm_scacheLock);
osi_Log0(afsd_logp,"cm_GetSCache Freelance and special");
- if (cm_getLocalMountPointChange()) { // check for changes
- cm_clearLocalMountPointChange(); // clear the changefile
- lock_ReleaseWrite(&cm_scacheLock);
- cm_reInitLocalMountPoints(); // start reinit
- lock_ObtainWrite(&cm_scacheLock);
+ if (cm_getLocalMountPointChange()) {
+ cm_clearLocalMountPointChange();
+ cm_reInitLocalMountPoints();
}
- 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;
+ 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 {
- fileType = CM_SCACHETYPE_INVALID;
-
- }
- lock_ReleaseMutex(&cm_Freelance_Lock);
-
- if (scp == NULL)
- scp = cm_GetNewSCache();
- if (scp == NULL) {
- osi_Log0(afsd_logp,"cm_GetSCache unable to obtain *new* scache entry");
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_ObtainWrite(&scp->rw);
- lock_ObtainWrite(&cm_scacheLock);
-#endif
+ lock_ObtainWrite(&scp->rw);
+ lock_ObtainWrite(&cm_scacheLock);
+ }
scp->fid = *fidp;
scp->dotdotFid.cell=AFS_FAKE_ROOT_CELL_ID;
scp->dotdotFid.volume=AFS_FAKE_ROOT_VOL_ID;
}
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 */
-#if not_too_dangerous
- lock_ReleaseWrite(&scp->rw);
-#endif
- *outScpp = scp;
+ scp->lockDataVersion=CM_SCACHE_VERSION_BAD; /* no lock yet */
+ scp->fsLockCount=0;
+ 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;
}
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);
cm_AdjustScacheLRU(scp);
}
/* 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_ObtainWrite(&scp->rw);
- lock_ObtainWrite(&cm_scacheLock);
-#endif
scp->fid = *fidp;
if (!cm_freelanceEnabled || !isRoot) {
/* if this scache entry represents a volume root then we need
scp->nextp = cm_data.scacheHashTablep[hash];
cm_data.scacheHashTablep[hash] = scp;
scp->flags |= CM_SCACHEFLAG_INHASH;
- scp->refCount = 1;
- osi_Log1(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%x", scp);
-#if not_too_dangerous
lock_ReleaseWrite(&scp->rw);
+ scp->refCount = 1;
+#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;
}
afs_uint32 sleep_buf_cmflags = 0;
afs_uint32 sleep_scp_bufs = 0;
int wakeupCycle;
- int getAccessRights = 1;
lock_AssertWrite(&scp->rw);
* operation ran first, or even which order a read and
* a write occurred in.
*/
- 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 FETCHSTATUS", scp);
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING | CM_SCACHEFLAG_SIZESETTING |
+ CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESETTING|SIZESTORING|GETCALLBACK want FETCHSTATUS", scp);
goto sleep;
}
}
/* 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 |
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING | CM_SCACHEFLAG_SIZESETTING |
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);
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESETTING|SIZESTORING|GETCALLBACK want STORESIZE|STORESTATUS|SETSIZE|GETCALLBACK", scp);
goto sleep;
}
- if (scp->bufReadsp || scp->bufWritesp) {
+ if ((!bufp || bufp && scp->fileType == CM_SCACHETYPE_FILE) &&
+ (scp->bufReadsp || scp->bufWritesp)) {
osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is bufRead|bufWrite want STORESIZE|STORESTATUS|SETSIZE|GETCALLBACK", scp);
goto sleep;
}
* nothing is happening to that chunk, and that we aren't
* changing the basic file status info, either.
*/
- 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 FETCHDATA", scp);
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING | CM_SCACHEFLAG_SIZESETTING |
+ CM_SCACHEFLAG_SIZESTORING | CM_SCACHEFLAG_GETCALLBACK)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESETTING|SIZESTORING|GETCALLBACK want FETCHDATA", scp);
goto sleep;
}
if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING | CM_BUF_CMSTORING | CM_BUF_CMWRITING))) {
* 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)) {
- osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING want SETSTATUS", scp);
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING |
+ CM_SCACHEFLAG_SIZESETTING | CM_SCACHEFLAG_SIZESTORING)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESETTING|SIZESTORING want SETSTATUS", scp);
goto sleep;
}
}
/* 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)) {
- osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESTORING want WRITE", scp);
+ if (scp->flags & (CM_SCACHEFLAG_FETCHING | CM_SCACHEFLAG_STORING | CM_SCACHEFLAG_SIZESETTING |
+ CM_SCACHEFLAG_SIZESTORING)) {
+ osi_Log1(afsd_logp, "CM SyncOp scp 0x%p is FETCHING|STORING|SIZESETTING|SIZESTORING want WRITE", scp);
goto sleep;
}
if (bufp && (bufp->cmFlags & (CM_BUF_CMFETCHING |
}
}
- // yj: modified this so that callback only checked if we're
- // not checking something on /afs
- /* fix the conditional to match the one in cm_HaveCallback */
- if ((flags & CM_SCACHESYNC_NEEDCALLBACK)
-#ifdef AFS_FREELANCE_CLIENT
- && (!cm_freelanceEnabled ||
- !(scp->fid.vnode==0x1 && scp->fid.unique==0x1) ||
- scp->fid.cell!=AFS_FAKE_ROOT_CELL_ID ||
- scp->fid.volume!=AFS_FAKE_ROOT_VOL_ID ||
- cm_fakeDirCallback < 2)
-#endif /* AFS_FREELANCE_CLIENT */
- ) {
+ if ((flags & CM_SCACHESYNC_NEEDCALLBACK)) {
if ((flags & CM_SCACHESYNC_FORCECB) || !cm_HaveCallback(scp)) {
osi_Log1(afsd_logp, "CM SyncOp getting callback on scp 0x%p",
scp);
if ((rights & (PRSFS_WRITE|PRSFS_DELETE)) && (scp->flags & CM_SCACHEFLAG_RO))
return CM_ERROR_READONLY;
- if (cm_HaveAccessRights(scp, userp, rights, &outRights) || !getAccessRights) {
+ if (cm_HaveAccessRights(scp, userp, rights, &outRights)) {
if (~outRights & rights)
return CM_ERROR_NOACCESS;
}
}
if (code)
return code;
- getAccessRights = 0; /* do not repeat */
continue;
}
}
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",
scp->flags |= CM_SCACHEFLAG_FETCHING;
if (flags & CM_SCACHESYNC_STORESTATUS)
scp->flags |= CM_SCACHEFLAG_STORING;
+ if (flags & CM_SCACHESYNC_SETSIZE)
+ scp->flags |= CM_SCACHEFLAG_SIZESETTING;
if (flags & CM_SCACHESYNC_STORESIZE)
scp->flags |= CM_SCACHEFLAG_SIZESTORING;
if (flags & CM_SCACHESYNC_GETCALLBACK)
scp->flags |= CM_SCACHEFLAG_LOCKING;
/* now update the buffer pointer */
- if (flags & CM_SCACHESYNC_FETCHDATA) {
+ if (bufp && (flags & CM_SCACHESYNC_FETCHDATA)) {
/* ensure that the buffer isn't already in the I/O list */
- if (bufp) {
- for(qdp = scp->bufReadsp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
- tbufp = osi_GetQData(qdp);
- osi_assertx(tbufp != bufp, "unexpected cm_buf_t value");
- }
+ for (qdp = scp->bufReadsp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
+ tbufp = osi_GetQData(qdp);
+ osi_assertx(tbufp != bufp, "unexpected cm_buf_t value");
}
/* queue a held reference to the buffer in the "reading" I/O list */
qdp = osi_QDAlloc();
osi_SetQData(qdp, bufp);
- if (bufp) {
- buf_Hold(bufp);
- bufp->cmFlags |= CM_BUF_CMFETCHING;
- }
+
+ buf_Hold(bufp);
+ bufp->cmFlags |= CM_BUF_CMFETCHING;
osi_QAdd((osi_queue_t **) &scp->bufReadsp, &qdp->q);
}
- if (flags & CM_SCACHESYNC_STOREDATA) {
+ if (bufp && (flags & CM_SCACHESYNC_STOREDATA)) {
+ osi_assertx(scp->fileType == CM_SCACHETYPE_FILE,
+ "attempting to store extents on a non-file object");
+
/* ensure that the buffer isn't already in the I/O list */
- if (bufp) {
- for(qdp = scp->bufWritesp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
- tbufp = osi_GetQData(qdp);
- osi_assertx(tbufp != bufp, "unexpected cm_buf_t value");
- }
+ for (qdp = scp->bufWritesp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
+ tbufp = osi_GetQData(qdp);
+ osi_assertx(tbufp != bufp, "unexpected cm_buf_t value");
}
/* queue a held reference to the buffer in the "writing" I/O list */
qdp = osi_QDAlloc();
osi_SetQData(qdp, bufp);
- if (bufp) {
- buf_Hold(bufp);
- bufp->cmFlags |= CM_BUF_CMSTORING;
- }
+ buf_Hold(bufp);
+ bufp->cmFlags |= CM_BUF_CMSTORING;
osi_QAdd((osi_queue_t **) &scp->bufWritesp, &qdp->q);
}
- if (flags & CM_SCACHESYNC_WRITE) {
+ if (bufp && (flags & CM_SCACHESYNC_WRITE)) {
/* mark the buffer as being written to. */
- if (bufp) {
- bufp->cmFlags |= CM_BUF_CMWRITING;
- }
+ bufp->cmFlags |= CM_BUF_CMWRITING;
}
return 0;
scp->flags &= ~CM_SCACHEFLAG_FETCHING;
if (flags & CM_SCACHESYNC_STORESTATUS)
scp->flags &= ~CM_SCACHEFLAG_STORING;
+ if (flags & CM_SCACHESYNC_SETSIZE)
+ scp->flags &= ~CM_SCACHEFLAG_SIZESETTING;
if (flags & CM_SCACHESYNC_STORESIZE)
scp->flags &= ~CM_SCACHEFLAG_SIZESTORING;
if (flags & CM_SCACHESYNC_GETCALLBACK)
scp->flags &= ~CM_SCACHEFLAG_LOCKING;
/* now update the buffer pointer */
- if (flags & CM_SCACHESYNC_FETCHDATA) {
+ if (bufp && (flags & CM_SCACHESYNC_FETCHDATA)) {
int release = 0;
- /* ensure that the buffer isn't already in the I/O list */
- for(qdp = scp->bufReadsp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
+ /* ensure that the buffer is in the I/O list */
+ for (qdp = scp->bufReadsp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
tbufp = osi_GetQData(qdp);
if (tbufp == bufp)
break;
osi_QDFree(qdp);
release = 1;
}
- if (bufp) {
- 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);
- }
- if (release)
- buf_Release(bufp);
+ bufp->cmFlags &= ~(CM_BUF_CMFETCHING | CM_BUF_CMFULLYFETCHED);
+ if (bufp->flags & CM_BUF_WAITING) {
+ osi_Log2(afsd_logp, "CM SyncOpDone FetchData Waking [scp 0x%p] bufp 0x%p", scp, bufp);
+ osi_Wakeup((LONG_PTR) &bufp);
}
+ if (release)
+ buf_Release(bufp);
}
/* now update the buffer pointer */
- if (flags & CM_SCACHESYNC_STOREDATA) {
+ if (bufp && (flags & CM_SCACHESYNC_STOREDATA)) {
int release = 0;
- /* ensure that the buffer isn't already in the I/O list */
- for(qdp = scp->bufWritesp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
+ /* ensure that the buffer is in the I/O list */
+ for (qdp = scp->bufWritesp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) {
tbufp = osi_GetQData(qdp);
if (tbufp == bufp)
break;
osi_QDFree(qdp);
release = 1;
}
- 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);
- }
- if (release)
- buf_Release(bufp);
+ bufp->cmFlags &= ~CM_BUF_CMSTORING;
+ if (bufp->flags & CM_BUF_WAITING) {
+ osi_Log2(afsd_logp, "CM SyncOpDone StoreData Waking [scp 0x%p] bufp 0x%p", scp, bufp);
+ osi_Wakeup((LONG_PTR) &bufp);
}
+ if (release)
+ buf_Release(bufp);
}
- if (flags & CM_SCACHESYNC_WRITE) {
- if (bufp) {
- osi_assertx(bufp->cmFlags & CM_BUF_CMWRITING, "!CM_BUF_CMWRITING");
-
- bufp->cmFlags &= ~CM_BUF_CMWRITING;
- }
+ if (bufp && (flags & CM_SCACHESYNC_WRITE)) {
+ osi_assertx(bufp->cmFlags & CM_BUF_CMWRITING, "!CM_BUF_CMWRITING");
+ bufp->cmFlags &= ~CM_BUF_CMWRITING;
}
/* and wakeup anyone who is waiting */
if (scp->flags & CM_SCACHEFLAG_WAITING) {
- osi_Log1(afsd_logp, "CM SyncOpDone Waking scp 0x%p", scp);
+ osi_Log3(afsd_logp, "CM SyncOpDone 0x%x Waking scp 0x%p bufp 0x%p", flags, scp, bufp);
osi_Wakeup((LONG_PTR) &scp->flags);
}
}
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;
+ struct cm_volume *volp = NULL;
+ struct cm_cell *cellp = NULL;
// 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;
scp->parentVnode = 0;
scp->parentUnique = 0;
}
- return;
+ goto done;
} else {
scp->flags &= ~CM_SCACHEFLAG_EACCESS;
}
dataVersion <<= 32;
dataVersion |= statusp->DataVersion;
- if (!(flags & CM_MERGEFLAG_FORCE) && dataVersion < scp->dataVersion) {
- struct cm_cell *cellp;
+ if (!(flags & CM_MERGEFLAG_FORCE) &&
+ dataVersion < scp->dataVersion &&
+ scp->dataVersion != CM_SCACHE_VERSION_BAD) {
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)");
- if (volp)
- cm_PutVolume(volp);
}
osi_Log3(afsd_logp, "Bad merge, scp %x, scp dv %d, RPC dv %d",
scp, scp->dataVersion, dataVersion);
* infinite loop. So we just grin and bear it.
*/
if (!(scp->flags & CM_SCACHEFLAG_RO))
- return;
+ goto done;
}
+ if (cm_readonlyVolumeVersioning)
+ 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.
*/
*lbpp = bp->hashp; /* hash out */
bp->hashp = NULL;
- bp->flags &= ~CM_BUF_INHASH;
+ bp->qFlags &= ~CM_BUF_QINHASH;
}
lock_ReleaseMutex(&bp->mx);
}
* have completed yet.
*/
cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_FETCHSTATUS);
+
+ /*
+ * We just successfully merged status on the stat cache object.
+ * This means that the associated volume must be online.
+ */
+ if (!volp) {
+ if (!cellp)
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
+ cm_FindVolumeByID(cellp, scp->fid.volume, userp, reqp, 0, &volp);
+ }
+ if (volp) {
+ cm_vol_state_t *statep = cm_VolumeStateByID(volp, scp->fid.volume);
+ if (statep->state != vl_online) {
+ lock_ObtainWrite(&volp->rw);
+ cm_VolumeStatusNotification(volp, statep->ID, statep->state, vl_online);
+ statep->state = vl_online;
+ lock_ReleaseWrite(&volp->rw);
+ }
+ }
+ done:
+ if (volp)
+ cm_PutVolume(volp);
+
}
/* note that our stat cache info is incorrect, so force us eventually
scp->cbServerp = NULL;
}
scp->cbExpires = 0;
- scp->flags &= ~CM_SCACHEFLAG_CALLBACK;
+ scp->volumeCreationDate = 0;
+ scp->flags &= ~(CM_SCACHEFLAG_CALLBACK | CM_SCACHEFLAG_LOCAL);
cm_dnlcPurgedp(scp);
cm_dnlcPurgevp(scp);
cm_FreeAllACLEnts(scp);
#endif
{
afs_int32 refCount;
- long lockstate;
osi_assertx(scp != NULL, "null cm_scache_t");
lock_AssertAny(&cm_scacheLock);
- lockstate = lock_GetRWLockState(&cm_scacheLock);
refCount = InterlockedDecrement(&scp->refCount);
#ifdef DEBUG_REFCOUNT
if (refCount < 0)
if (refCount == 0 && (scp->flags & CM_SCACHEFLAG_DELETED)) {
int deleted = 0;
+ long lockstate;
+
+ lockstate = lock_GetRWLockState(&cm_scacheLock);
if (lockstate != OSI_RWLOCK_WRITEHELD)
- lock_ConvertRToW(&cm_scacheLock);
+ lock_ReleaseRead(&cm_scacheLock);
+ else
+ lock_ReleaseWrite(&cm_scacheLock);
+
lock_ObtainWrite(&scp->rw);
if (scp->flags & CM_SCACHEFLAG_DELETED)
deleted = 1;
- lock_ReleaseWrite(&scp->rw);
- if (refCount == 0 && deleted)
+
+ if (refCount == 0 && deleted) {
+ lock_ObtainWrite(&cm_scacheLock);
cm_RecycleSCache(scp, 0);
- if (lockstate != OSI_RWLOCK_WRITEHELD)
- lock_ConvertWToR(&cm_scacheLock);
+ 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);
}
}
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_ReleaseRead(&cm_scacheLock);
if (scp->flags & CM_SCACHEFLAG_DELETED) {
int deleted = 0;
lock_ObtainWrite(&scp->rw);
if (scp->flags & CM_SCACHEFLAG_DELETED)
deleted = 1;
- lock_ReleaseWrite(&scp->rw);
if (deleted) {
- lock_ConvertRToW(&cm_scacheLock);
+ lock_ObtainWrite(&cm_scacheLock);
cm_RecycleSCache(scp, 0);
- lock_ConvertWToR(&cm_scacheLock);
+ lock_ReleaseWrite(&cm_scacheLock);
}
+ lock_ReleaseWrite(&scp->rw);
}
-
- lock_ReleaseRead(&cm_scacheLock);
}
/* 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) 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->fileType, scp->dataVersion, scp->length.QuadPart, scp->mountPointStringp, 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) {
+ 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);
+ }
+
+ 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++)
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