/* 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;
}
return -1;
}
+ lock_ObtainWrite(&scp->rw);
cm_RemoveSCacheFromHashTable(scp);
+ lock_ReleaseWrite(&scp->rw);
#if 0
if (flags & CM_SCACHE_RECYCLEFLAG_DESTROY_BUFFERS) {
* 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));
cm_scache_t *scp;
int retry = 0;
+ lock_AssertWrite(&cm_scacheLock);
#if 0
/* first pass - look for deleted objects */
for ( scp = cm_data.scacheLRULastp;
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;
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
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);
#endif
+#ifdef AFS_FREELANCE_CLIENT
+ if (cm_freelanceEnabled && special &&
+ cm_data.fakeDirVersion != scp->dataVersion)
+ break;
+#endif
cm_HoldSCacheNoLock(scp);
*outScpp = scp;
cm_AdjustScacheLRU(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
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
+ cm_reInitLocalMountPoints(); // start reinit
+ }
+
lock_ObtainMutex(&cm_Freelance_Lock);
if (fidp->vnode >= 2 && fidp->vnode - 2 < cm_noLocalMountPoints) {
strncpy(mp,(cm_localMountPoints+fidp->vnode-2)->mountPointStringp, MOUNTPOINTLEN);
}
lock_ReleaseMutex(&cm_Freelance_Lock);
-
- scp = cm_GetNewSCache();
+ lock_ObtainWrite(&cm_scacheLock);
+ 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);
lock_ObtainWrite(&cm_scacheLock);
#endif
scp->fid = *fidp;
- scp->volp = cm_data.rootSCachep->volp;
- if (scp->volp)
- cm_GetVolume(scp->volp); /* grab an additional reference */
scp->dotdotFid.cell=AFS_FAKE_ROOT_CELL_ID;
scp->dotdotFid.volume=AFS_FAKE_ROOT_VOL_ID;
scp->dotdotFid.unique=1;
scp->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;
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);
osi_Log1(afsd_logp,"cm_GetSCache (3) outScpp 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)
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;
{
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_buf_cmflags = 0;
afs_uint32 sleep_scp_bufs = 0;
int wakeupCycle;
+ int getAccessRights = 1;
+
+ lock_AssertWrite(&scp->rw);
/* lookup this first */
bufLocked = flags & CM_SCACHESYNC_BUFLOCKED;
/* 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 (cm_HaveAccessRights(scp, userp, rights, &outRights) || !getAccessRights) {
if (~outRights & rights)
return CM_ERROR_NOACCESS;
}
}
if (code)
return code;
+ getAccessRights = 0; /* do not repeat */
continue;
}
}
if (scp->cbServerp) {
struct cm_volume *volp = NULL;
- cm_GetVolumeByID(cellp, scp->fid.volume, userp,
+ cm_FindVolumeByID(cellp, scp->fid.volume, userp,
(cm_req_t *) NULL, CM_GETVOL_FLAG_CREATE, &volp);
osi_Log2(afsd_logp, "old data from server %x volume %s",
scp->cbServerp->addr.sin_addr.s_addr,
}
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
#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)
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;
+ if (lockstate != OSI_RWLOCK_WRITEHELD)
+ lock_ConvertRToW(&cm_scacheLock);
+ lock_ObtainWrite(&scp->rw);
+ if (scp->flags & CM_SCACHEFLAG_DELETED)
+ deleted = 1;
+ lock_ReleaseWrite(&scp->rw);
+ if (refCount == 0 && deleted)
+ cm_RecycleSCache(scp, 0);
+ if (lockstate != OSI_RWLOCK_WRITEHELD)
+ lock_ConvertWToR(&cm_scacheLock);
+ }
}
#ifdef DEBUG_REFCOUNT
osi_Log2(afsd_logp,"cm_ReleaseSCache scp 0x%p ref %d",scp, refCount);
afsi_log("%s:%d cm_ReleaseSCache scp 0x%p ref %d", file, line, scp, refCount);
#endif
+
+ 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);
+ cm_RecycleSCache(scp, 0);
+ lock_ConvertWToR(&cm_scacheLock);
+ }
+ }
+
lock_ReleaseRead(&cm_scacheLock);
}
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' 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,
+ scp->fileType, scp->dataVersion, scp->length.QuadPart, scp->mountPointStringp, scp->flags,
(unsigned long)scp->cbExpires, scp->refCount);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
}