/* 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);
return -1;
}
+ lock_ObtainWrite(&scp->rw);
cm_RemoveSCacheFromHashTable(scp);
+ lock_ReleaseWrite(&scp->rw);
#if 0
if (flags & CM_SCACHE_RECYCLEFLAG_DESTROY_BUFFERS) {
cm_scache_t *scp;
int retry = 0;
+ lock_AssertWrite(&cm_scacheLock);
#if 0
/* first pass - look for deleted objects */
for ( scp = cm_data.scacheLRULastp;
#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 (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) {
+ if (lockstate != OSI_RWLOCK_WRITEHELD)
+ lock_ConvertRToW(&cm_scacheLock);
+ 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);
}
AFSVolSync volSync;
struct rx_connection * callp;
cm_dirOp_t dirop;
+ cm_scache_t *scp = NULL;
#ifdef AFS_FREELANCE_CLIENT
if (cm_freelanceEnabled && dscp == cm_data.rootSCachep) {
}
#endif
+ code = cm_Lookup(dscp, namep, CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+
/* make sure we don't screw up the dir status during the merge */
code = cm_BeginDirOp(dscp, userp, reqp, CM_DIRLOCK_NONE, &dirop);
}
cm_EndDirOp(&dirop);
+ if (scp) {
+ cm_ReleaseSCache(scp);
+ if (code == 0) {
+ lock_ObtainWrite(&scp->rw);
+ scp->flags |= CM_SCACHEFLAG_DELETED;
+ lock_ReleaseWrite(&scp->rw);
+ }
+ }
+
return code;
}
AFSVolSync volSync;
struct rx_connection * callp;
cm_dirOp_t dirop;
+ cm_scache_t *scp = NULL;
+
+ code = cm_Lookup(dscp, namep, CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
/* before starting the RPC, mark that we're changing the directory data,
* so that someone who does a chmod on the dir will wait until our
}
cm_EndDirOp(&dirop);
+ if (scp) {
+ cm_ReleaseSCache(scp);
+ if (code == 0) {
+ lock_ObtainWrite(&scp->rw);
+ scp->flags |= CM_SCACHEFLAG_DELETED;
+ lock_ReleaseWrite(&scp->rw);
+ }
+ }
+
/* and return error code */
return code;
}
char *pathp = NULL;
cm_scache_t * scp = NULL;
cm_scache_t *delscp = NULL;
- int deleted = 0;
int nullcreator = 0;
osi_Log4(smb_logp, "smb_CloseFID Closing fidp 0x%x (fid=%d scp=0x%x vcp=0x%x)",
if (delscp->fileType == CM_SCACHETYPE_DIRECTORY) {
code = cm_RemoveDir(dscp, originalNamep, fullPathp, userp, &req);
if (code == 0) {
- deleted = 1;
if (dscp->flags & CM_SCACHEFLAG_ANYWATCH)
smb_NotifyChange(FILE_ACTION_REMOVED,
FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_CREATION,
} else {
code = cm_Unlink(dscp, originalNamep, fullPathp, userp, &req);
if (code == 0) {
- deleted = 1;
if (dscp->flags & CM_SCACHEFLAG_ANYWATCH)
smb_NotifyChange(FILE_ACTION_REMOVED,
FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_CREATION,
cm_ReleaseSCache(dscp);
if (delscp) {
- if (deleted) {
- lock_ObtainWrite(&delscp->rw);
- if (deleted)
- delscp->flags |= CM_SCACHEFLAG_DELETED;
- lock_ReleaseWrite(&delscp->rw);
- }
cm_ReleaseSCache(delscp);
}