afs_int32 i, code;
struct vcache **uvc, *wvc;
+ /* NOTE: We must have nothing drop afs_xvcache until we have removed all
+ * possible references to this vcache. This means all hash tables, queues,
+ * DNLC, etc. */
+
*slept = 0;
AFS_STATCNT(afs_FlushVCache);
afs_Trace2(afs_iclSetp, CM_TRACE_FLUSHV, ICL_TYPE_POINTER, avc,
ICL_TYPE_INT32, avc->f.states);
- code = osi_VM_FlushVCache(avc, slept);
+ code = osi_VM_FlushVCache(avc);
if (code)
goto bad;
for (wvc = *uvc; wvc; uvc = &wvc->hnext, wvc = *uvc) {
if (avc == wvc) {
*uvc = avc->hnext;
- avc->hnext = (struct vcache *)NULL;
+ avc->hnext = NULL;
break;
}
}
else
osi_dnlc_purgevp(avc);
+ /* By this point, the vcache has been removed from all global structures
+ * via which someone could try to use the vcache. It is okay to drop
+ * afs_xvcache at this point (if *slept is set). */
+
if (!afs_shuttingdown)
afs_QueueVCB(avc, slept);
int tcount;
struct server *tsp;
int i;
- struct vrequest treq;
+ struct vrequest *treq = NULL;
struct afs_conn *tc;
int safety1, safety2, safety3;
XSTATS_DECLS;
if (AFS_IS_DISCONNECTED)
return ENETDOWN;
- if ((code = afs_InitReq(&treq, afs_osi_credp)))
+ if ((code = afs_CreateReq(&treq, afs_osi_credp)))
return code;
- treq.flags |= O_NONBLOCK;
+ treq->flags |= O_NONBLOCK;
tfids = afs_osi_Alloc(sizeof(struct AFSFid) * AFS_MAXCBRSCALL);
osi_Assert(tfids != NULL);
callBacks[0].CallBackType = CB_EXCLUSIVE;
for (safety3 = 0; safety3 < AFS_MAXHOSTS * 2; safety3++) {
tc = afs_ConnByHost(tsp, tsp->cell->fsport,
- tsp->cell->cellNum, &treq, 0,
+ tsp->cell->cellNum, treq, 0,
SHARED_LOCK, 0, &rxconn);
if (tc) {
XSTATS_START_TIME
} else
code = -1;
if (!afs_Analyze
- (tc, rxconn, code, 0, &treq,
+ (tc, rxconn, code, 0, treq,
AFS_STATS_FS_RPCIDX_GIVEUPCALLBACKS, SHARED_LOCK,
tsp->cell)) {
break;
if (lockit)
ReleaseWriteLock(&afs_xvcb);
afs_osi_Free(tfids, sizeof(struct AFSFid) * AFS_MAXCBRSCALL);
+ afs_DestroyReq(treq);
return 0;
}
struct vcache *tvc;
struct afs_q *tq, *uq;
int fv_slept, defersleep = 0;
+ int limit;
afs_int32 target = anumber;
- i = 0;
loop = 0;
+
+ retry:
+ i = 0;
+ limit = afs_vcount;
for (tq = VLRU.prev; tq != &VLRU && anumber > 0; tq = uq) {
tvc = QTOV(tq);
uq = QPrev(tq);
if (tvc->f.states & CVFlushed) {
refpanic("CVFlushed on VLRU");
- /* In the other path, this was 2 * afs_cacheStats */
- } else if (!afsd_dynamic_vcaches && i++ > afs_maxvcount) {
- refpanic("Exceeded pool of AFS vnodes(VLRU cycle?)");
+ } else if (i++ > limit) {
+ afs_warn("afs_ShakeLooseVCaches: i %d limit %d afs_vcount %d afs_maxvcount %d\n",
+ (int)i, limit, (int)afs_vcount, (int)afs_maxvcount);
+ refpanic("Found too many AFS vnodes on VLRU (VLRU cycle?)");
} else if (QNext(uq) != tq) {
refpanic("VLRU inconsistent");
} else if (tvc->f.states & CVInit) {
if (fv_slept) {
if (loop++ > 100)
break;
- uq = VLRU.prev;
- i = 0;
- continue; /* start over - may have raced. */
+ goto retry; /* start over - may have raced. */
}
- if (tq == uq) {
+ if (uq == &VLRU) {
if (anumber && !defersleep) {
defersleep = 1;
- tq = VLRU.prev;
- continue;
+ goto retry;
}
break;
}
struct afs_conn *tc;
afs_int32 code;
afs_ucred_t *cred = NULL;
- struct vrequest treq, ureq;
+ struct vrequest *treq = NULL;
struct AFSVolSync tsync;
int didCore;
XSTATS_DECLS;
AFS_STATCNT(afs_FlushActiveVcaches);
+
+ code = afs_CreateReq(&treq, afs_osi_credp);
+ if (code) {
+ afs_warn("unable to alloc treq\n");
+ return;
+ }
+
ObtainReadLock(&afs_xvcache);
for (i = 0; i < VCSIZE; i++) {
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
ReleaseReadLock(&afs_xvcache);
ObtainWriteLock(&tvc->lock, 51);
do {
- afs_InitReq(&treq, afs_osi_credp);
- treq.flags |= O_NONBLOCK;
+ code = afs_InitReq(treq, afs_osi_credp);
+ if (code) {
+ code = -1;
+ break; /* shutting down: do not try to extend the lock */
+ }
+ treq->flags |= O_NONBLOCK;
- tc = afs_Conn(&tvc->f.fid, &treq, SHARED_LOCK, &rxconn);
+ tc = afs_Conn(&tvc->f.fid, treq, SHARED_LOCK, &rxconn);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_EXTENDLOCK);
RX_AFS_GUNLOCK();
} else
code = -1;
} while (afs_Analyze
- (tc, rxconn, code, &tvc->f.fid, &treq,
+ (tc, rxconn, code, &tvc->f.fid, treq,
AFS_STATS_FS_RPCIDX_EXTENDLOCK, SHARED_LOCK, NULL));
ReleaseWriteLock(&tvc->lock);
*/
osi_vnhold(tvc, 0);
ReleaseReadLock(&afs_xvcache);
-#ifdef AFS_BOZONLOCK_ENV
- afs_BozonLock(&tvc->pvnLock, tvc);
-#endif
#if defined(AFS_SGI_ENV)
/*
* That's because if we come in via the CUnlinkedDel bit state path we'll be have 0 refcnt
/* XXXX Find better place-holder for cred XXXX */
cred = (afs_ucred_t *)tvc->linkData;
tvc->linkData = NULL; /* XXX */
- afs_InitReq(&ureq, cred);
+ code = afs_InitReq(treq, cred);
afs_Trace2(afs_iclSetp, CM_TRACE_ACTCCORE,
ICL_TYPE_POINTER, tvc, ICL_TYPE_INT32,
tvc->execsOrWriters);
- code = afs_StoreOnLastReference(tvc, &ureq);
+ if (!code) { /* avoid store when shutting down */
+ code = afs_StoreOnLastReference(tvc, treq);
+ }
ReleaseWriteLock(&tvc->lock);
-#ifdef AFS_BOZONLOCK_ENV
- afs_BozonUnlock(&tvc->pvnLock, tvc);
-#endif
hzero(tvc->flushDV);
osi_FlushText(tvc);
didCore = 1;
* Ignore errors
*/
ReleaseWriteLock(&tvc->lock);
-#ifdef AFS_BOZONLOCK_ENV
- afs_BozonUnlock(&tvc->pvnLock, tvc);
-#endif
#if defined(AFS_SGI_ENV)
AFS_RWUNLOCK((vnode_t *) tvc, VRWLOCK_WRITE);
#endif
} else {
/* lost (or won, perhaps) the race condition */
ReleaseWriteLock(&tvc->lock);
-#ifdef AFS_BOZONLOCK_ENV
- afs_BozonUnlock(&tvc->pvnLock, tvc);
-#endif
}
#if defined(AFS_SGI_ENV)
AFS_RWUNLOCK((vnode_t *) tvc, VRWLOCK_WRITE);
}
}
ReleaseReadLock(&afs_xvcache);
+ afs_DestroyReq(treq);
}
git://git.openafs.org / openafs.git / blobdiff