/* called with cm_scacheLock and scp write-locked; recycles an existing scp. */
long cm_RecycleSCache(cm_scache_t *scp, afs_int32 flags)
{
+ cm_fid_t fid;
+ afs_uint32 fileType;
+ int callback;
+
lock_AssertWrite(&cm_scacheLock);
lock_AssertWrite(&scp->rw);
return -1;
}
+ fid = scp->fid;
+ fileType = scp->fileType;
+ callback = scp->cbExpires ? 1 : 0;
+
cm_RemoveSCacheFromHashTable(scp);
+ if (scp->fileType == CM_SCACHETYPE_DIRECTORY &&
+ !cm_accessPerFileCheck) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+
+ if (volp) {
+ if (!(volp->flags & CM_VOLUMEFLAG_DFS_VOLUME))
+ cm_EAccesClearParentEntries(&fid);
+
+ cm_PutVolume(volp);
+ }
+ }
+
/* invalidate so next merge works fine;
* also initialize some flags */
scp->fileType = 0;
| CM_SCACHEFLAG_RO
| CM_SCACHEFLAG_PURERO
| CM_SCACHEFLAG_OVERQUOTA
- | CM_SCACHEFLAG_OUTOFSPACE
- | CM_SCACHEFLAG_EACCESS));
+ | CM_SCACHEFLAG_OUTOFSPACE));
scp->serverModTime = 0;
scp->dataVersion = CM_SCACHE_VERSION_BAD;
scp->bufDataVersionLow = CM_SCACHE_VERSION_BAD;
scp->cbServerp = NULL;
}
scp->cbExpires = 0;
+ scp->cbIssued = 0;
scp->volumeCreationDate = 0;
scp->fid.vnode = 0;
cm_FreeAllACLEnts(scp);
cm_ResetSCacheDirectory(scp, 0);
+
+ if (RDR_Initialized && callback) {
+ /*
+ * We drop the cm_scacheLock because it may be required to
+ * satisfy an ioctl request from the redirector. It should
+ * be safe to hold the scp->rw lock here because at this
+ * point (a) the object has just been recycled so the fid
+ * is nul and there are no requests that could possibly
+ * be issued by the redirector that would depend upon it.
+ */
+ lock_ReleaseWrite(&cm_scacheLock);
+ RDR_InvalidateObject( fid.cell, fid.volume, fid.vnode,
+ fid.unique, fid.hash,
+ fileType, AFS_INVALIDATE_EXPIRED);
+ lock_ObtainWrite(&cm_scacheLock);
+ }
+
return 0;
}
* Can allocate a new one if desperate, or if below quota (cm_data.maxSCaches).
* returns scp->rw write-locked.
*/
-cm_scache_t *cm_GetNewSCache(void)
+cm_scache_t *
+cm_GetNewSCache(afs_uint32 locked)
{
- cm_scache_t *scp;
- int retry = 0;
+ cm_scache_t *scp = NULL;
+ cm_scache_t *scp_prev = NULL;
+ cm_scache_t *scp_next = NULL;
+ int attempt = 0;
+
+ if (locked)
+ lock_AssertWrite(&cm_scacheLock);
+ else
+ lock_ObtainWrite(&cm_scacheLock);
- lock_AssertWrite(&cm_scacheLock);
if (cm_data.currentSCaches >= cm_data.maxSCaches) {
/* There were no deleted scache objects that we could use. Try to find
* one that simply hasn't been used in a while.
*/
- for (retry = 0 ; retry < 2; retry++) {
+ for (attempt = 0 ; attempt < 128; attempt++) {
+ afs_uint32 count = 0;
+
for ( scp = cm_data.scacheLRULastp;
scp;
scp = (cm_scache_t *) osi_QPrev(&scp->q))
{
+ /*
+ * We save the prev and next pointers in the
+ * LRU because we are going to drop the cm_scacheLock and
+ * the order of the list could change out from beneath us.
+ * If both changed, it means that this entry has been moved
+ * within the LRU and it should no longer be recycled.
+ */
+ scp_prev = (cm_scache_t *) osi_QPrev(&scp->q);
+ scp_next = (cm_scache_t *) osi_QNext(&scp->q);
+ count++;
+
/* It is possible for the refCount to be zero and for there still
* to be outstanding dirty buffers. If there are dirty buffers,
* we must not recycle the scp.
* it unless we have to.
*/
if (scp->refCount == 0 && scp->bufReadsp == NULL && scp->bufWritesp == NULL) {
- if (!buf_DirtyBuffersExist(&scp->fid) && !buf_RDRBuffersExist(&scp->fid)) {
+ afs_uint32 buf_dirty = 0;
+ afs_uint32 buf_rdr = 0;
+
+ lock_ReleaseWrite(&cm_scacheLock);
+ buf_dirty = buf_DirtyBuffersExist(&scp->fid);
+ if (!buf_dirty)
+ buf_rdr = buf_RDRBuffersExist(&scp->fid);
+
+ if (!buf_dirty && !buf_rdr) {
cm_fid_t fid;
afs_uint32 fileType;
+ int success;
- if (!lock_TryWrite(&scp->rw))
- continue;
+ success = lock_TryWrite(&scp->rw);
+
+ lock_ObtainWrite(&cm_scacheLock);
+ if (scp_prev != (cm_scache_t *) osi_QPrev(&scp->q) &&
+ scp_next != (cm_scache_t *) osi_QNext(&scp->q))
+ {
+ osi_Log1(afsd_logp, "GetNewSCache scp 0x%p; LRU order changed", scp);
+ if (success)
+ lock_ReleaseWrite(&scp->rw);
+ break;
+ } else if (!success) {
+ osi_Log1(afsd_logp, "GetNewSCache failed to obtain lock scp 0x%p", scp);
+ continue;
+ }
/* Found a likely candidate. Save type and fid in case we succeed */
fid = scp->fid;
*/
cm_AdjustScacheLRU(scp);
- if (RDR_Initialized) {
- /*
- * We drop the cm_scacheLock because it may be required to
- * satisfy an ioctl request from the redirector. It should
- * be safe to hold the scp->rw lock here because at this
- * point (a) the object has just been recycled so the fid
- * is nul and there are no requests that could possibly
- * be issued by the redirector that would depend upon it.
- */
- lock_ReleaseWrite(&cm_scacheLock);
- RDR_InvalidateObject( fid.cell, fid.volume, fid.vnode,
- fid.unique, fid.hash,
- fileType, AFS_INVALIDATE_EXPIRED);
- lock_ObtainWrite(&cm_scacheLock);
- }
-
- /* and we're done */
- return scp;
+ /* and we're done - SUCCESS */
+ osi_assertx(!(scp->flags & CM_SCACHEFLAG_INHASH), "CM_SCACHEFLAG_INHASH set");
+ goto done;
}
lock_ReleaseWrite(&scp->rw);
} else {
- osi_Log1(afsd_logp,"GetNewSCache dirty buffers exist scp 0x%p", scp);
+ if (buf_rdr)
+ osi_Log1(afsd_logp,"GetNewSCache redirector is holding extents scp 0x%p", scp);
+ else
+ osi_Log1(afsd_logp, "GetNewSCache dirty buffers scp 0x%p", scp);
+
+ lock_ObtainWrite(&cm_scacheLock);
+ if (scp_prev != (cm_scache_t *) osi_QPrev(&scp->q) &&
+ scp_next != (cm_scache_t *) osi_QNext(&scp->q))
+ {
+ osi_Log1(afsd_logp, "GetNewSCache scp 0x%p; LRU order changed", scp);
+ break;
+ }
}
}
+ } /* for */
+
+ osi_Log2(afsd_logp, "GetNewSCache all scache entries in use (attempt = %d, count = %u)", attempt, count);
+ if (scp == NULL) {
+ /*
+ * The entire LRU queue was walked and no available cm_scache_t was
+ * found. Drop the cm_scacheLock and sleep for a moment to give a
+ * chance for cm_scache_t objects to be released.
+ */
+ lock_ReleaseWrite(&cm_scacheLock);
+ Sleep(50);
+ lock_ObtainWrite(&cm_scacheLock);
}
- osi_Log1(afsd_logp, "GetNewSCache all scache entries in use (retry = %d)", retry);
}
- return NULL;
+ /* FAILURE */
+ scp = NULL;
+ goto done;
}
/* if we get here, we should allocate a new scache entry. We either are below
#ifdef USE_BPLUS
lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock", LOCK_HIERARCHY_SCACHE_DIRLOCK);
#endif
+ lock_InitializeMutex(&scp->redirMx, "cm_scache_t redirMx", LOCK_HIERARCHY_SCACHE_REDIRMX);
scp->serverLock = -1;
+ scp->dataVersion = CM_SCACHE_VERSION_BAD;
+ scp->bufDataVersionLow = CM_SCACHE_VERSION_BAD;
+ scp->lockDataVersion = CM_SCACHE_VERSION_BAD;
/* and put it in the LRU queue */
- 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);
cm_data.currentSCaches++;
cm_dnlcPurgedp(scp); /* make doubly sure that this is not in dnlc */
cm_dnlcPurgevp(scp);
scp->allNextp = cm_data.allSCachesp;
cm_data.allSCachesp = scp;
+
+ done:
+ if (!locked)
+ lock_ReleaseWrite(&cm_scacheLock);
+
return scp;
}
fidp->volume = volume;
fidp->vnode = vnode;
fidp->unique = unique;
- fidp->hash = ((cell & 0xF) << 28) | ((volume & 0x3F) << 22) | ((vnode & 0x7FF) << 11) | (unique & 0x7FF);
+ CM_FID_GEN_HASH(fidp);
}
/* like strcmp, only for fids */
cm_data.fakeSCache.magic = CM_SCACHE_MAGIC;
cm_data.fakeSCache.cbServerp = (struct cm_server *)(-1);
cm_data.fakeSCache.cbExpires = (time_t)-1;
+ cm_data.fakeSCache.cbExpires = time(NULL);
/* can leave clientModTime at 0 */
cm_data.fakeSCache.fileType = CM_SCACHETYPE_FILE;
cm_data.fakeSCache.unixModeBits = 0777;
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);
+ lock_InitializeMutex(&cm_data.fakeSCache.redirMx, "cm_scache_t redirMx", LOCK_HIERARCHY_SCACHE_REDIRMX);
}
long
scp->cbServerp = NULL;
}
scp->cbExpires = 0;
+ scp->cbIssued = 0;
_InterlockedAnd(&scp->flags, ~CM_SCACHEFLAG_CALLBACK);
lock_ReleaseWrite(&scp->rw);
#endif
lock_FinalizeRWLock(&scp->rw);
lock_FinalizeRWLock(&scp->bufCreateLock);
+ lock_FinalizeMutex(&scp->redirMx);
}
lock_ReleaseWrite(&cm_scacheLock);
#endif
scp->cbServerp = NULL;
scp->cbExpires = 0;
+ scp->cbIssued = 0;
scp->volumeCreationDate = 0;
scp->fileLocksH = NULL;
scp->fileLocksT = NULL;
scp->redirBufCount = 0;
scp->redirQueueT = NULL;
scp->redirQueueH = NULL;
+ lock_InitializeMutex(&scp->redirMx, "cm_scache_t redirMx", LOCK_HIERARCHY_SCACHE_REDIRMX);
}
}
cm_allFileLocks = NULL;
}
#ifdef DEBUG_REFCOUNT
-long cm_GetSCacheDbg(cm_fid_t *fidp, cm_scache_t **outScpp, cm_user_t *userp,
+long cm_GetSCacheDbg(cm_fid_t *fidp, cm_fid_t *parentFidp, cm_scache_t **outScpp, cm_user_t *userp,
cm_req_t *reqp, char * file, long line)
#else
-long cm_GetSCache(cm_fid_t *fidp, cm_scache_t **outScpp, cm_user_t *userp,
+long cm_GetSCache(cm_fid_t *fidp, cm_fid_t *parentFidp, cm_scache_t **outScpp, cm_user_t *userp,
cm_req_t *reqp)
#endif
{
long hash;
cm_scache_t *scp = NULL;
+ cm_scache_t *newScp = NULL;
long code;
cm_volume_t *volp = NULL;
cm_cell_t *cellp;
int special = 0; // yj: boolean variable to test if file is on root.afs
int isRoot = 0;
extern cm_fid_t cm_rootFid;
+ afs_int32 refCount;
hash = CM_SCACHE_HASH(fidp);
// yj: check if we have the scp, if so, we don't need
// to do anything else
- 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) {
#ifdef DEBUG_REFCOUNT
cm_data.fakeDirVersion != scp->dataVersion)
break;
#endif
+ if (parentFidp && scp->parentVnode == 0) {
+ scp->parentVnode = parentFidp->vnode;
+ scp->parentUnique = parentFidp->unique;
+ }
cm_HoldSCacheNoLock(scp);
*outScpp = scp;
+ lock_ConvertRToW(&cm_scacheLock);
cm_AdjustScacheLRU(scp);
lock_ReleaseWrite(&cm_scacheLock);
return 0;
}
}
+ lock_ReleaseRead(&cm_scacheLock);
// yj: when we get here, it means we don't have an scp
// so we need to either load it or fake it, depending
}
if (cm_freelanceEnabled && special) {
- lock_ReleaseWrite(&cm_scacheLock);
osi_Log0(afsd_logp,"cm_GetSCache Freelance and special");
if (cm_getLocalMountPointChange()) {
cm_reInitLocalMountPoints();
}
- lock_ObtainWrite(&cm_scacheLock);
if (scp == NULL) {
- scp = cm_GetNewSCache(); /* returns scp->rw held */
+ scp = cm_GetNewSCache(FALSE); /* 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);
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->dotdotFid.unique=1;
- scp->dotdotFid.vnode=1;
+ cm_SetFid(&scp->dotdotFid,AFS_FAKE_ROOT_CELL_ID,AFS_FAKE_ROOT_VOL_ID,1,1);
+ if (parentFidp) {
+ scp->parentVnode = parentFidp->vnode;
+ scp->parentUnique = parentFidp->unique;
+ }
_InterlockedOr(&scp->flags, (CM_SCACHEFLAG_PURERO | CM_SCACHEFLAG_RO));
+ lock_ObtainWrite(&cm_scacheLock);
if (!(scp->flags & CM_SCACHEFLAG_INHASH)) {
scp->nextp = cm_data.scacheHashTablep[hash];
cm_data.scacheHashTablep[hash] = scp;
_InterlockedOr(&scp->flags, CM_SCACHEFLAG_INHASH);
}
- scp->refCount = 1;
- osi_Log1(afsd_logp,"cm_GetSCache (freelance) sets refCount to 1 scp 0x%p", scp);
+ refCount = InterlockedIncrement(&scp->refCount);
+ osi_Log2(afsd_logp,"cm_GetSCache (freelance) sets refCount to 1 scp 0x%p refCount %d", scp, refCount);
+ lock_ReleaseWrite(&cm_scacheLock);
/* must be called after the scp->fid is set */
cm_FreelanceFetchMountPointString(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) scp 0x%p ref %d", file, line, scp, scp->refCount);
// end of yj code
#endif /* AFS_FREELANCE_CLIENT */
+ /* we don't have the fid, recycle something */
+ newScp = cm_GetNewSCache(FALSE); /* returns scp->rw held */
+ if (newScp == NULL) {
+ osi_Log0(afsd_logp,"cm_GetNewSCache unable to obtain *new* scache entry");
+ return CM_ERROR_WOULDBLOCK;
+ }
+#ifdef DEBUG_REFCOUNT
+ afsi_log("%s:%d cm_GetNewSCache returns scp 0x%p flags 0x%x", file, line, newScp, newScp->flags);
+#endif
+ osi_Log2(afsd_logp,"cm_GetNewSCache returns scp 0x%p flags 0x%x", newScp, newScp->flags);
+
/* otherwise, we need to find the volume */
if (!cm_freelanceEnabled || !isRoot) {
- lock_ReleaseWrite(&cm_scacheLock); /* for perf. reasons */
cellp = cm_FindCellByID(fidp->cell, 0);
- if (!cellp)
+ if (!cellp) {
+ /* put back newScp so it can be reused */
+ lock_ObtainWrite(&cm_scacheLock);
+ newScp->flags |= CM_SCACHEFLAG_DELETED;
+ cm_AdjustScacheLRU(newScp);
+ lock_ReleaseWrite(&newScp->rw);
+ lock_ReleaseWrite(&cm_scacheLock);
return CM_ERROR_NOSUCHCELL;
+ }
code = cm_FindVolumeByID(cellp, fidp->volume, userp, reqp, CM_GETVOL_FLAG_CREATE, &volp);
- if (code)
+ if (code) {
+ /* put back newScp so it can be reused */
+ lock_ObtainWrite(&cm_scacheLock);
+ newScp->flags |= CM_SCACHEFLAG_DELETED;
+ cm_AdjustScacheLRU(newScp);
+ lock_ReleaseWrite(&newScp->rw);
+ lock_ReleaseWrite(&cm_scacheLock);
return code;
- lock_ObtainWrite(&cm_scacheLock);
+ }
}
- /* otherwise, we have the volume, now reverify that the scp doesn't
- * exist, and proceed.
+ /*
+ * otherwise, we have the volume, now reverify that the scp doesn't
+ * exist, and proceed. make sure that we hold the cm_scacheLock
+ * write-locked until the scp is put into the hash table in order
+ * to avoid a race.
*/
+ 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) scp 0x%p ref %d", file, line, scp, scp->refCount);
osi_Log1(afsd_logp,"cm_GetSCache (3) scp 0x%p", scp);
#endif
+ if (parentFidp && scp->parentVnode == 0) {
+ scp->parentVnode = parentFidp->vnode;
+ scp->parentUnique = parentFidp->unique;
+ }
+ if (volp)
+ cm_PutVolume(volp);
cm_HoldSCacheNoLock(scp);
cm_AdjustScacheLRU(scp);
+
+ /* put back newScp so it can be reused */
+ newScp->flags |= CM_SCACHEFLAG_DELETED;
+ cm_AdjustScacheLRU(newScp);
+ lock_ReleaseWrite(&newScp->rw);
lock_ReleaseWrite(&cm_scacheLock);
- if (volp)
- cm_PutVolume(volp);
+
*outScpp = scp;
return 0;
}
}
- /* now, if we don't have the fid, recycle something */
- 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);
- if (volp)
- cm_PutVolume(volp);
- return CM_ERROR_WOULDBLOCK;
- }
-#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");
-
+ scp = newScp;
scp->fid = *fidp;
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
+ * to copy the dotdotFid from the volume structure where the
* "master" copy is stored (defect 11489)
*/
if (volp->vol[ROVOL].ID == fidp->volume) {
scp->dotdotFid = cm_VolumeStateByType(volp, RWVOL)->dotdotFid;
}
}
+ if (parentFidp) {
+ scp->parentVnode = parentFidp->vnode;
+ scp->parentUnique = parentFidp->unique;
+ }
if (volp)
cm_PutVolume(volp);
+
scp->nextp = cm_data.scacheHashTablep[hash];
cm_data.scacheHashTablep[hash] = scp;
_InterlockedOr(&scp->flags, CM_SCACHEFLAG_INHASH);
+ refCount = InterlockedIncrement(&scp->refCount);
+ lock_ReleaseWrite(&cm_scacheLock);
lock_ReleaseWrite(&scp->rw);
- scp->refCount = 1;
#ifdef DEBUG_REFCOUNT
- afsi_log("%s:%d cm_GetSCache sets refCount to 1 scp 0x%p", file, line, scp);
+ afsi_log("%s:%d cm_GetSCache sets refCount to 1 scp 0x%p refCount %d", file, line, scp, refCount);
#endif
- osi_Log1(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%p", scp);
+ osi_Log2(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%p refCount %d", scp, refCount);
/* XXX - The following fields in the cm_scache are
* uninitialized:
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_fid_t parent_fid;
cm_scache_t * pscp = NULL;
+ if (scp->parentVnode == 0)
+ return NULL;
+
lock_ObtainWrite(&cm_scacheLock);
cm_SetFid(&parent_fid, scp->fid.cell, scp->fid.volume, scp->parentVnode, scp->parentUnique);
if ((flags & CM_SCACHESYNC_FORCECB) || !cm_HaveCallback(scp)) {
osi_Log1(afsd_logp, "CM SyncOp getting callback on scp 0x%p",
scp);
+
+ if (cm_EAccesFindEntry(userp, &scp->fid))
+ return CM_ERROR_NOACCESS;
+
if (bufLocked)
lock_ReleaseMutex(&bufp->mx);
code = cm_GetCallback(scp, userp, reqp, (flags & CM_SCACHESYNC_FORCECB)?1:0);
}
}
+static afs_uint32
+dv_diff(afs_uint64 dv1, afs_uint64 dv2)
+{
+ if ( dv1 - dv2 > 0x7FFFFFFF )
+ return (afs_uint32)(dv2 - dv1);
+ else
+ return (afs_uint32)(dv1 - dv2);
+}
+
/* merge in a response from an RPC. The scp must be locked, and the callback
* is optional.
*
#endif /* AFS_FREELANCE_CLIENT */
if (statusp->errorCode != 0) {
- _InterlockedOr(&scp->flags, CM_SCACHEFLAG_EACCESS);
switch (statusp->errorCode) {
case EACCES:
case UAEACCES:
case EPERM:
case UAEPERM:
- _InterlockedOr(&scp->flags, CM_SCACHEFLAG_EACCESS);
+ cm_EAccesAddEntry(userp, &scp->fid, &dscp->fid);
}
osi_Log2(afsd_logp, "Merge, Failure scp 0x%p code 0x%x", scp, statusp->errorCode);
scp->bufDataVersionLow = CM_SCACHE_VERSION_BAD;
scp->fsLockCount = 0;
- if (dscp) {
+ if (dscp && dscp != scp) {
scp->parentVnode = dscp->fid.vnode;
scp->parentUnique = dscp->fid.unique;
} else {
scp->parentVnode = 0;
scp->parentUnique = 0;
}
- goto done;
- } else {
- _InterlockedAnd(&scp->flags, ~CM_SCACHEFLAG_EACCESS);
+
+ if (RDR_Initialized)
+ rdr_invalidate = 1;
}
dataVersion = statusp->dataVersionHigh;
scp->cbServerp->addr.sin_addr.s_addr,
volp ? volp->namep : "(unknown)");
}
+
osi_Log3(afsd_logp, "Bad merge, scp 0x%p, scp dv %d, RPC dv %d",
scp, scp->dataVersion, dataVersion);
/* we have a number of data fetch/store operations running
cm_AddACLCache(scp, userp, statusp->CallerAccess);
}
- if (scp->dataVersion != 0 &&
- (!(flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) && dataVersion != scp->dataVersion ||
- (flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) && dataVersion - scp->dataVersion > activeRPCs)) {
+ if (dataVersion != 0 && scp->dataVersion != CM_SCACHE_VERSION_BAD &&
+ (!(flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) && (dataVersion != scp->dataVersion) ||
+ (flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) &&
+ (dv_diff(dataVersion, scp->dataVersion) > activeRPCs))) {
/*
* We now know that all of the data buffers that we have associated
* with this scp are invalid. Subsequent operations will go faster
* object during an uncontested storeData operation. As a result this
* merge status no longer has performance characteristics derived from
* the size of the file.
+ *
+ * For directory buffers, only current dataVersion values are up to date.
*/
- if (((flags & CM_MERGEFLAG_STOREDATA) && dataVersion - scp->dataVersion > activeRPCs) ||
- (!(flags & CM_MERGEFLAG_STOREDATA) && scp->dataVersion != dataVersion) ||
- scp->bufDataVersionLow == 0)
+ if (((flags & (CM_MERGEFLAG_STOREDATA|CM_MERGEFLAG_DIROP)) && (dv_diff(dataVersion, scp->dataVersion) > activeRPCs)) ||
+ (!(flags & (CM_MERGEFLAG_STOREDATA|CM_MERGEFLAG_DIROP)) && (scp->dataVersion != dataVersion)) ||
+ scp->bufDataVersionLow == CM_SCACHE_VERSION_BAD ||
+ scp->fileType == CM_SCACHETYPE_DIRECTORY)
scp->bufDataVersionLow = dataVersion;
- if (RDR_Initialized && scp->dataVersion != CM_SCACHE_VERSION_BAD) {
- if ( ( !(reqp->flags & CM_REQ_SOURCE_REDIR) || !(flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA))) &&
- scp->dataVersion != dataVersion && (dataVersion - scp->dataVersion > activeRPCs - 1)) {
+ if (RDR_Initialized) {
+ /*
+ * The redirector maintains its own cached status information which
+ * must be updated when a DV change occurs that is not the result
+ * of a redirector initiated data change.
+ *
+ * If the current old DV is BAD, send a DV change notification.
+ *
+ * If the DV has changed and request was not initiated by the
+ * redirector, send a DV change notification.
+ *
+ * If the request was initiated by the redirector, send a notification
+ * for store and directory operations that result in a DV change greater
+ * than the number of active RPCs or any other operation that results
+ * in an unexpected DV change such as FetchStatus.
+ */
+
+ if (scp->dataVersion == CM_SCACHE_VERSION_BAD && dataVersion != 0) {
rdr_invalidate = 1;
- } else if ( (reqp->flags & CM_REQ_SOURCE_REDIR) && (flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) &&
- dataVersion - scp->dataVersion > activeRPCs) {
+ } else if (!(reqp->flags & CM_REQ_SOURCE_REDIR) && scp->dataVersion != dataVersion) {
rdr_invalidate = 1;
+ } else if (reqp->flags & CM_REQ_SOURCE_REDIR) {
+ if (!(flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) &&
+ (dv_diff(dataVersion, scp->dataVersion) > activeRPCs - 1)) {
+ rdr_invalidate = 1;
+ } else if ((flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) &&
+ dv_diff(dataVersion, scp->dataVersion) > activeRPCs) {
+ rdr_invalidate = 1;
+ }
}
}
scp->dataVersion = dataVersion;
}
}
+ /* Remove cached EACCES / EPERM errors if the file is a directory */
+ if (scp->fileType == CM_SCACHETYPE_DIRECTORY &&
+ !(volp && (volp->flags & CM_VOLUMEFLAG_DFS_VOLUME)) &&
+ !cm_accessPerFileCheck)
+ {
+ cm_EAccesClearParentEntries(&scp->fid);
+ }
+
done:
if (volp)
cm_PutVolume(volp);
scp->cbServerp = NULL;
}
scp->cbExpires = 0;
+ scp->cbIssued = 0;
scp->volumeCreationDate = 0;
_InterlockedAnd(&scp->flags, ~(CM_SCACHEFLAG_CALLBACK | CM_SCACHEFLAG_LOCAL | CM_SCACHEFLAG_RDR_IN_USE));
cm_dnlcPurgedp(scp);
git://git.openafs.org / openafs.git / blobdiff