{
if (scp == cm_data.scacheLRULastp)
cm_data.scacheLRULastp = (cm_scache_t *) osi_QPrev(&scp->q);
- osi_QRemove((osi_queue_t **) &cm_data.scacheLRUFirstp, &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; recycles an existing scp. */
+long cm_RecycleSCache(cm_scache_t *scp, afs_int32 flags)
+{
+ cm_scache_t **lscpp;
+ cm_scache_t *tscp;
+ int i;
+
+ 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);
+ }
+ }
+ 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);
+ }
+
+ /* 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);
+
+ /* 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;
+ }
+
+ /* discard symlink info */
+ scp->mountPointStringp[0] = 0;
+ memset(&scp->mountRootFid, 0, sizeof(cm_fid_t));
+ memset(&scp->dotdotFid, 0, sizeof(cm_fid_t));
+
+ /* reset locking info */
+ scp->fileLocksH = NULL;
+ scp->fileLocksT = NULL;
+ scp->serverLock = (-1);
+ scp->exclusiveLocks = 0;
+ scp->sharedLocks = 0;
+
+ /* not locked, but there can be no references to this guy
+ * while we hold the global refcount lock.
+ */
+ cm_FreeAllACLEnts(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;
- int i;
- cm_scache_t **lscpp;
- cm_scache_t *tscp;
+ start:
if (cm_data.currentSCaches >= cm_data.maxSCaches) {
for (scp = cm_data.scacheLRULastp;
scp;
if (scp) {
osi_assert(scp >= cm_data.scacheBaseAddress && scp < (cm_scache_t *)cm_data.hashTablep);
- /* we found an entry, so return it */
- 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");
- }
-
- /* 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;
- 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);
-
- /* 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;
- }
-
- /* discard symlink info */
- scp->mountPointStringp[0] = 0;
- memset(&scp->mountRootFid, 0, sizeof(cm_fid_t));
- memset(&scp->dotdotFid, 0, sizeof(cm_fid_t));
-
- /* reset locking info */
- scp->fileLocksH = NULL;
- scp->fileLocksT = NULL;
- scp->serverLock = (-1);
- scp->exclusiveLocks = 0;
- scp->sharedLocks = 0;
- /* not locked, but there can be no references to this guy
- * while we hold the global refcount lock.
- */
- cm_FreeAllACLEnts(scp);
-
- /* 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;
+ 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;
+ }
}
}
mp = "";
}
scp = cm_GetNewSCache();
-
+
+ lock_ObtainMutex(&scp->mx);
scp->fid = *fidp;
scp->volp = cm_data.rootSCachep->volp;
scp->dotdotFid.cell=AFS_FAKE_ROOT_CELL_ID;
lock_ObtainMutex(&cm_Freelance_Lock);
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->group=0;
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
/* 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 */
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 */
if (!cm_HaveCallback(scp)) {
osi_Log1(afsd_logp, "CM SyncOp getting callback on scp 0x%p",
scp);
- if (bufLocked) lock_ReleaseMutex(&bufp->mx);
- code = cm_GetCallback(scp, up, reqp, 0);
+ if (bufLocked)
+ lock_ReleaseMutex(&bufp->mx);
+ code = cm_GetCallback(scp, userp, reqp, 0);
if (bufLocked) {
lock_ReleaseMutex(&scp->mx);
lock_ObtainMutex(&bufp->mx);
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;
}
}
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);
/* 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;
* 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
statusp->FileType = CM_SCACHETYPE_DIRECTORY;
statusp->LinkCount = scp->linkCount;
statusp->Length = cm_fakeDirSize;
+ statusp->Length_hi = 0;
statusp->DataVersion = cm_data.fakeDirVersion;
statusp->Author = 0x1;
statusp->Owner = 0x0;
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;
}
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)
git://git.openafs.org / openafs.git / blobdiff