#include <afsconfig.h>
#include "afs/param.h"
-
-#include "afs/sysincludes.h" /*Standard vendor system headers */
-#include "afsincludes.h" /*AFS-based standard headers */
+#include "afs/sysincludes.h" /*Standard vendor system headers */
+#include "afsincludes.h" /*AFS-based standard headers */
#include "afs/afs_stats.h"
#include "afs/afs_cbqueue.h"
#include "afs/afs_osidnlc.h"
#endif /* AFS_SGI64_ENV */
/* Exported variables */
-#ifdef AFS_DISCON_ENV
afs_rwlock_t afs_xvcdirty; /*Lock: discon vcache dirty list mgmt */
-#endif
afs_rwlock_t afs_xvcache; /*Lock: alloc new stat cache entries */
afs_rwlock_t afs_xvreclaim; /*Lock: entries reclaimed, not on free list */
afs_lock_t afs_xvcb; /*Lock: fids on which there are callbacks */
int afs_norefpanic = 0;
-/* Disk backed vcache definitions
+/* Disk backed vcache definitions
* Both protected by xvcache */
-#ifdef AFS_DISCON_ENV
static int afs_nextVcacheSlot = 0;
static struct afs_slotlist *afs_freeSlotList = NULL;
-#endif
/* Forward declarations */
static afs_int32 afs_QueueVCB(struct vcache *avc);
/*!
* Generate an index into the hash table for a given Fid.
- * \param fid
+ * \param fid
* \return The hash value.
*/
static int
vn_reinit(AFSTOV(avc));
#endif
afs_FreeAllAxs(&(avc->Access));
- afs_QueueVCB(avc);
+ if (!afs_shuttingdown)
+ afs_QueueVCB(avc);
ObtainWriteLock(&afs_xcbhash, 460);
afs_DequeueCallback(avc); /* remove it from queued callbacks list */
avc->f.states &= ~(CStatd | CUnique);
else
afs_evenZaps++;
+ afs_vcount--;
#if !defined(AFS_LINUX22_ENV)
/* put the entry in the free list */
avc->nextfree = freeVCList;
avc->f.states |= CVFlushed;
#else
/* This should put it back on the vnode free list since usecount is 1 */
- afs_vcount--;
vSetType(avc, VREG);
if (VREFCOUNT_GT(avc,0)) {
AFS_RELE(AFSTOV(avc));
/*!
* The core of the inactive vnode op for all but IRIX.
*
- * \param avc
+ * \param avc
* \param acred
*/
void
*/
static struct afs_cbr *afs_cbrSpace = 0;
/* if alloc limit below changes, fix me! */
-static struct afs_cbr *afs_cbrHeads[2];
+static struct afs_cbr *afs_cbrHeads[16];
struct afs_cbr *
afs_AllocCBR(void)
{
- register struct afs_cbr *tsp;
+ struct afs_cbr *tsp;
int i;
- while (!afs_cbrSpace) {
- if (afs_stats_cmperf.CallBackAlloced >= 2) {
- /* don't allocate more than 2 * AFS_NCBRS for now */
- afs_FlushVCBs(0);
+ if (!afs_cbrSpace) {
+ afs_osi_CancelWait(&AFS_WaitHandler); /* trigger FlushVCBs asap */
+
+ if (afs_stats_cmperf.CallBackAlloced >= sizeof(afs_cbrHeads)/sizeof(afs_cbrHeads[0])) {
+ /* don't allocate more than 16 * AFS_NCBRS for now */
+ tsp = (struct afs_cbr *)osi_AllocSmallSpace(sizeof(*tsp));
+ tsp->dynalloc = 1;
+ tsp->next = NULL;
afs_stats_cmperf.CallBackFlushes++;
} else {
/* try allocating */
- tsp =
- (struct afs_cbr *)afs_osi_Alloc(AFS_NCBRS *
- sizeof(struct afs_cbr));
+ tsp = afs_osi_Alloc(AFS_NCBRS * sizeof(struct afs_cbr));
+ osi_Assert(tsp != NULL);
for (i = 0; i < AFS_NCBRS - 1; i++) {
tsp[i].next = &tsp[i + 1];
+ tsp[i].dynalloc = 0;
}
tsp[AFS_NCBRS - 1].next = 0;
- afs_cbrSpace = tsp;
+ tsp[AFS_NCBRS - 1].dynalloc = 0;
+ afs_cbrSpace = tsp->next;
afs_cbrHeads[afs_stats_cmperf.CallBackAlloced] = tsp;
afs_stats_cmperf.CallBackAlloced++;
}
+ } else {
+ tsp = afs_cbrSpace;
+ afs_cbrSpace = tsp->next;
}
- tsp = afs_cbrSpace;
- afs_cbrSpace = tsp->next;
return tsp;
}
* \rerurn 0
*/
int
-afs_FreeCBR(register struct afs_cbr *asp)
+afs_FreeCBR(struct afs_cbr *asp)
{
*(asp->pprev) = asp->next;
if (asp->next)
if (asp->hash_next)
asp->hash_next->hash_pprev = asp->hash_pprev;
- asp->next = afs_cbrSpace;
- afs_cbrSpace = asp;
+ if (asp->dynalloc) {
+ osi_FreeSmallSpace(asp);
+ } else {
+ asp->next = afs_cbrSpace;
+ afs_cbrSpace = asp;
+ }
return 0;
}
+static void
+FlushAllVCBs(struct rx_connection **rxconns, int nconns, int nservers,
+ struct afs_conn **conns, struct srvAddr **addrs)
+{
+ afs_int32 *results;
+ afs_int32 i;
+
+ results = afs_osi_Alloc(nservers * sizeof (afs_int32));
+ osi_Assert(results != NULL);
+
+ AFS_GUNLOCK();
+ multi_Rx(rxconns,nconns)
+ {
+ multi_RXAFS_GiveUpAllCallBacks();
+ results[multi_i] = multi_error;
+ } multi_End;
+ AFS_GLOCK();
+
+ /*
+ * Freeing the CBR will unlink it from the server's CBR list
+ * do it here, not in the loop, because a dynamic CBR will call
+ * into the memory management routines.
+ */
+ for ( i = 0 ; i < nconns ; i++ ) {
+ if (results[i] == 0) {
+ /* Unchain all of them */
+ while (addrs[i]->server->cbrs)
+ afs_FreeCBR(addrs[i]->server->cbrs);
+ }
+ }
+ afs_osi_Free(results, nservers * sizeof(afs_int32));
+}
+
/*!
* Flush all queued callbacks to all servers.
*
struct afs_conn *tc;
int safety1, safety2, safety3;
XSTATS_DECLS;
+
+ if (AFS_IS_DISCONNECTED)
+ return ENETDOWN;
+
if ((code = afs_InitReq(&treq, afs_osi_credp)))
return code;
treq.flags |= O_NONBLOCK;
tfids = afs_osi_Alloc(sizeof(struct AFSFid) * AFS_MAXCBRSCALL);
+ osi_Assert(tfids != NULL);
if (lockit)
ObtainWriteLock(&afs_xvcb, 273);
+ /*
+ * Shutting down.
+ * First, attempt a multi across everything, all addresses
+ * for all servers we know of.
+ */
+
+ if (lockit == 2)
+ afs_LoopServers(2, NULL, 0, FlushAllVCBs, NULL);
+
ObtainReadLock(&afs_xserver);
for (i = 0; i < NSERVERS; i++) {
for (safety1 = 0, tsp = afs_servers[i];
ReleaseWriteLock(&afs_xvcb);
}
-void
+void
afs_FlushReclaimedVcaches(void)
{
#if !defined(AFS_LINUX22_ENV)
struct vcache *tvc;
int code, fv_slept;
- struct vcache *tmpReclaimedVCList = NULL;
+ struct vcache *tmpReclaimedVCList = NULL;
ObtainWriteLock(&afs_xvreclaim, 76);
while (ReclaimedVCList) {
afs_osi_Wakeup(&tvc->f.states);
}
}
- if (tmpReclaimedVCList)
+ if (tmpReclaimedVCList)
ReclaimedVCList = tmpReclaimedVCList;
ReleaseWriteLock(&afs_xvreclaim);
#endif
}
+void
+afs_PostPopulateVCache(struct vcache *avc, struct VenusFid *afid, int seq)
+{
+ /*
+ * The proper value for mvstat (for root fids) is setup by the caller.
+ */
+ avc->mvstat = 0;
+ if (afid->Fid.Vnode == 1 && afid->Fid.Unique == 1)
+ avc->mvstat = 2;
+
+ if (afs_globalVFS == 0)
+ osi_Panic("afs globalvfs");
+
+ osi_PostPopulateVCache(avc);
+
+ avc->dchint = NULL;
+ osi_dnlc_purgedp(avc); /* this may be overkill */
+ memset(&(avc->callsort), 0, sizeof(struct afs_q));
+ avc->slocks = NULL;
+ avc->f.states &=~ CVInit;
+ if (seq) {
+ avc->f.states |= CBulkFetching;
+ avc->f.m.Length = seq;
+ }
+ afs_osi_Wakeup(&avc->f.states);
+}
+
int
afs_ShakeLooseVCaches(afs_int32 anumber)
{
-#if defined(AFS_LINUX22_ENV)
- afs_int32 i;
+ afs_int32 i, loop;
struct vcache *tvc;
struct afs_q *tq, *uq;
- int code, fv_slept;
+ int fv_slept, defersleep = 0;
afs_int32 target = anumber;
- if (afsd_dynamic_vcaches || afs_vcount >= afs_maxvcount) {
- i = 0;
- 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");
- } else if (!afsd_dynamic_vcaches && i++ > afs_maxvcount) {
- refpanic("Exceeded pool of AFS vnodes(VLRU cycle?)");
- } else if (QNext(uq) != tq) {
- refpanic("VLRU inconsistent");
- } else if (!VREFCOUNT_GT(tvc,0)) {
- refpanic("refcnt 0 on VLRU");
- }
+ i = 0;
+ loop = 0;
+ 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 (QNext(uq) != tq) {
+ refpanic("VLRU inconsistent");
+ } else if (tvc->f.states & CVInit) {
+ continue;
+ }
-#if defined(AFS_LINUX22_ENV)
- if (tvc != afs_globalVp && VREFCOUNT(tvc) > 1 && tvc->opens == 0) {
- struct dentry *dentry;
- struct list_head *cur, *head;
- AFS_GUNLOCK();
-#if defined(AFS_LINUX24_ENV)
- spin_lock(&dcache_lock);
-#endif /* AFS_LINUX24_ENV */
- head = &(AFSTOV(tvc))->i_dentry;
-
-restart:
- cur = head;
- while ((cur = cur->next) != head) {
- dentry = list_entry(cur, struct dentry, d_alias);
-
- if (d_unhashed(dentry))
- continue;
-
- dget_locked(dentry);
-
-#if defined(AFS_LINUX24_ENV)
- spin_unlock(&dcache_lock);
-#endif /* AFS_LINUX24_ENV */
- if (d_invalidate(dentry) == -EBUSY) {
- dput(dentry);
- /* perhaps lock and try to continue? (use cur as head?) */
- goto inuse;
- }
- dput(dentry);
-#if defined(AFS_LINUX24_ENV)
- spin_lock(&dcache_lock);
-#endif /* AFS_LINUX24_ENV */
- goto restart;
- }
-#if defined(AFS_LINUX24_ENV)
- spin_unlock(&dcache_lock);
-#endif /* AFS_LINUX24_ENV */
- inuse:
- AFS_GLOCK();
- }
-#endif /* AFS_LINUX22_ENV */
+ fv_slept = 0;
+ if (osi_TryEvictVCache(tvc, &fv_slept, defersleep))
+ anumber--;
- if (VREFCOUNT_GT(tvc,0) && !VREFCOUNT_GT(tvc,1) &&
- tvc->opens == 0
- && (tvc->f.states & CUnlinkedDel) == 0) {
- code = afs_FlushVCache(tvc, &fv_slept);
- if (code == 0) {
- anumber--;
- }
- if (fv_slept) {
- uq = VLRU.prev;
- i = 0;
- continue; /* start over - may have raced. */
- }
- }
- if (tq == uq)
+ if (fv_slept) {
+ if (loop++ > 100)
break;
+ uq = VLRU.prev;
+ i = 0;
+ continue; /* start over - may have raced. */
}
- if (!afsd_dynamic_vcaches && anumber == target) {
- afs_warn("afs_ShakeLooseVCaches: warning none freed, using %d of %d\n",
- afs_vcount, afs_maxvcount);
+ if (tq == uq) {
+ if (anumber && !defersleep) {
+ defersleep = 1;
+ tq = VLRU.prev;
+ continue;
+ }
+ break;
}
- } /* finished freeing up space */
-/*
- printf("recycled %d entries\n", target-anumber);
-*/
-#endif
+ }
+ if (!afsd_dynamic_vcaches && anumber == target) {
+ afs_warn("afs_ShakeLooseVCaches: warning none freed, using %d of %d\n",
+ afs_vcount, afs_maxvcount);
+ }
+
return 0;
}
/* Alloc new vnode. */
static struct vcache *
-afs_AllocVCache(void)
+afs_AllocVCache(void)
{
struct vcache *tvc;
-#if defined(AFS_LINUX22_ENV)
- struct inode *ip;
- AFS_GUNLOCK();
- ip = new_inode(afs_globalVFS);
- if (!ip)
- osi_Panic("afs_AllocVCache: no more inodes");
- AFS_GLOCK();
-#if defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE)
- tvc = VTOAFS(ip);
-#else
- tvc = afs_osi_Alloc(sizeof(struct vcache));
- ip->u.generic_ip = tvc;
- tvc->v = ip;
-#endif
+ tvc = osi_NewVnode();
afs_vcount++;
}
afs_stats_cmperf.vcacheXAllocs++; /* count in case we have a leak */
-#else
- /* none free, making one is better than a panic */
- afs_stats_cmperf.vcacheXAllocs++; /* count in case we have a leak */
- tvc = (struct vcache *)afs_osi_Alloc(sizeof(struct vcache));
-#if (defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)) && !defined(UKERNEL)
- tvc->v = NULL; /* important to clean this, or use memset 0 */
-#endif /* DARWIN || XBSD && !UKERNEL */
-#ifdef KERNEL_HAVE_PIN
- pin((char *)tvc, sizeof(struct vcache)); /* XXX */
-#endif
-#if defined(AFS_SGI_ENV)
- {
- char name[METER_NAMSZ];
- memset(tvc, 0, sizeof(struct vcache));
- tvc->v.v_number = ++afsvnumbers;
- tvc->vc_rwlockid = OSI_NO_LOCKID;
- initnsema(&tvc->vc_rwlock, 1,
- makesname(name, "vrw", tvc->v.v_number));
-#ifndef AFS_SGI53_ENV
- initnsema(&tvc->v.v_sync, 0,
- makesname(name, "vsy", tvc->v.v_number));
-#endif
-#ifndef AFS_SGI62_ENV
- initnlock(&tvc->v.v_lock,
- makesname(name, "vlk", tvc->v.v_number));
-#endif
- }
-#endif /* AFS_SGI_ENV */
-#endif
-#ifdef AFS_DISCON_ENV
+
/* If we create a new inode, we either give it a new slot number,
* or if one's available, use a slot number from the slot free list
*/
if (afs_freeSlotList != NULL) {
struct afs_slotlist *tmp;
-
+
tvc->diskSlot = afs_freeSlotList->slot;
tmp = afs_freeSlotList;
afs_freeSlotList = tmp->next;
} else {
tvc->diskSlot = afs_nextVcacheSlot++;
}
-#endif
return tvc;
}
+/* Pre populate a newly allocated vcache. On platforms where the actual
+ * vnode is attached to the vcache, this function is called before attachment,
+ * therefore it cannot perform any actions on the vnode itself */
+
+static void
+afs_PrePopulateVCache(struct vcache *avc, struct VenusFid *afid,
+ struct server *serverp) {
+
+ afs_uint32 slot;
+ slot = avc->diskSlot;
+
+ osi_PrePopulateVCache(avc);
+
+ avc->diskSlot = slot;
+ QZero(&avc->metadirty);
+
+ AFS_RWLOCK_INIT(&avc->lock, "vcache lock");
+
+ avc->mvid = NULL;
+ avc->linkData = NULL;
+ avc->cbExpires = 0;
+ avc->opens = 0;
+ avc->execsOrWriters = 0;
+ avc->flockCount = 0;
+ avc->f.states = CVInit;
+ avc->last_looker = 0;
+ avc->f.fid = *afid;
+ avc->asynchrony = -1;
+ avc->vc_error = 0;
+
+ hzero(avc->mapDV);
+ avc->f.truncPos = AFS_NOTRUNC; /* don't truncate until we need to */
+ hzero(avc->f.m.DataVersion); /* in case we copy it into flushDV */
+ avc->Access = NULL;
+ avc->callback = serverp; /* to minimize chance that clear
+ * request is lost */
+
+#if defined(AFS_CACHE_BYPASS)
+ avc->cachingStates = 0;
+ avc->cachingTransitions = 0;
+#endif
+}
+
/*!
* This routine is responsible for allocating a new cache entry
* from the free list. It formats the cache entry and inserts it
struct vcache *tvc;
afs_int32 i, j;
afs_int32 anumber = VCACHE_FREE;
-#ifdef AFS_AIX_ENV
- struct gnode *gnodepnt;
-#endif
-#if !defined(AFS_LINUX22_ENV)
- struct afs_q *tq, *uq;
- int code, fv_slept;
-#endif
AFS_STATCNT(afs_NewVCache);
afs_FlushReclaimedVcaches();
#if defined(AFS_LINUX22_ENV)
- if(!afsd_dynamic_vcaches) {
+ if(!afsd_dynamic_vcaches && afs_vcount >= afs_maxvcount) {
afs_ShakeLooseVCaches(anumber);
if (afs_vcount >= afs_maxvcount) {
afs_warn("afs_NewVCache - none freed\n");
#else /* AFS_LINUX22_ENV */
/* pull out a free cache entry */
if (!freeVCList) {
- int loop = 0;
- i = 0;
- for (tq = VLRU.prev; (anumber > 0) && (tq != &VLRU); tq = uq) {
- tvc = QTOV(tq);
- uq = QPrev(tq);
-
- if (tvc->f.states & CVFlushed) {
- refpanic("CVFlushed on VLRU");
- } else if (i++ > 2 * afs_cacheStats) { /* even allowing for a few xallocs... */
- refpanic("Increase -stat parameter of afsd(VLRU cycle?)");
- } else if (QNext(uq) != tq) {
- refpanic("VLRU inconsistent");
- } else if (tvc->f.states & CVInit) {
- continue;
- }
-
- if (!VREFCOUNT_GT(tvc,0)
-#if defined(AFS_DARWIN_ENV) && !defined(UKERNEL) && !defined(AFS_DARWIN80_ENV)
- || ((VREFCOUNT(tvc) == 1) &&
- (UBCINFOEXISTS(AFSTOV(tvc))))
-#endif
- && tvc->opens == 0 && (tvc->f.states & CUnlinkedDel) == 0) {
-#if defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
-#ifdef AFS_DARWIN80_ENV
- vnode_t tvp = AFSTOV(tvc);
- /* VREFCOUNT_GT only sees usecounts, not iocounts */
- /* so this may fail to actually recycle the vnode now */
- /* must call vnode_get to avoid races. */
- fv_slept = 0;
- if (vnode_get(tvp) == 0) {
- fv_slept=1;
- /* must release lock, since vnode_put will immediately
- reclaim if there are no other users */
- ReleaseWriteLock(&afs_xvcache);
- AFS_GUNLOCK();
- vnode_recycle(tvp);
- vnode_put(tvp);
- AFS_GLOCK();
- ObtainWriteLock(&afs_xvcache, 336);
- }
- /* we can't use the vnode_recycle return value to figure
- * this out, since the iocount we have to hold makes it
- * always "fail" */
- if (AFSTOV(tvc) == tvp) {
- if (anumber > 0 && fv_slept) {
- QRemove(&tvc->vlruq);
- QAdd(&VLRU, &tvc->vlruq);
- }
- code = EBUSY;
- } else
- code = 0;
-#else /* AFS_DARWIN80_ENV */
- /*
- * vgone() reclaims the vnode, which calls afs_FlushVCache(),
- * then it puts the vnode on the free list.
- * If we don't do this we end up with a cleaned vnode that's
- * not on the free list.
- * XXX assume FreeBSD is the same for now.
- */
- AFS_GUNLOCK();
-#if defined(AFS_FBSD80_ENV)
- /* vgone() is correct, but v_usecount is assumed not
- * to be 0, and I suspect that currently our usage ensures that
- * in fact it will */
- if (vrefcnt(AFSTOV(tvc)) < 1) {
- vref(AFSTOV(tvc));
- }
- vn_lock(AFSTOV(tvc), LK_EXCLUSIVE | LK_RETRY); /* !glocked */
-#endif
- vgone(AFSTOV(tvc));
-#if defined(AFS_FBSD80_ENV)
- VOP_UNLOCK(AFSTOV(tvc), 0);
-#endif
- fv_slept = 0;
- code = 0;
- AFS_GLOCK();
-#endif
-#else /* AFS_DARWIN80_ENV || AFS_XBSD_ENV */
- code = afs_FlushVCache(tvc, &fv_slept);
-#endif /* AFS_DARWIN80_ENV || AFS_XBSD_ENV */
- if (code == 0) {
- anumber--;
- }
- if (fv_slept) {
- if (loop++ > 100)
- break;
- uq = VLRU.prev;
- i = 0;
- continue; /* start over - may have raced. */
- }
- }
- if (tq == uq)
- break;
- }
- } /* end of if (!freeVCList) */
+ afs_ShakeLooseVCaches(anumber);
+ }
if (!freeVCList) {
tvc = afs_AllocVCache();
tvc = freeVCList; /* take from free list */
freeVCList = tvc->nextfree;
tvc->nextfree = NULL;
+ afs_vcount++; /* balanced by FlushVCache */
} /* end of if (!freeVCList) */
#endif /* AFS_LINUX22_ENV */
panic("afs_NewVCache(): free vcache with vnode attached");
#endif
-#if !defined(AFS_SGI_ENV) && !defined(AFS_LINUX22_ENV)
+ /* Populate the vcache with as much as we can. */
+ afs_PrePopulateVCache(tvc, afid, serverp);
-#if defined(AFS_DISCON_ENV)
- /* We need to preserve the slot that we're being stored into on
- * disk */
- {
- afs_uint32 slot;
- slot = tvc->diskSlot;
- memset(tvc, 0, sizeof(struct vcache));
- tvc->diskSlot = slot;
- }
-#else
- memset(tvc, 0, sizeof(struct vcache));
-#endif
-
-#else
- tvc->uncred = 0;
- memset(&(tvc->f), 0, sizeof(struct fvcache));
-#endif
-
- AFS_RWLOCK_INIT(&tvc->lock, "vcache lock");
-#if defined(AFS_SUN5_ENV)
- AFS_RWLOCK_INIT(&tvc->vlock, "vcache vlock");
-#endif /* defined(AFS_SUN5_ENV) */
-
- tvc->mvid = NULL;
- tvc->linkData = NULL;
- tvc->cbExpires = 0;
- tvc->opens = 0;
- tvc->execsOrWriters = 0;
- tvc->flockCount = 0;
- tvc->f.states = CVInit;
- tvc->last_looker = 0;
- tvc->f.fid = *afid;
- tvc->asynchrony = -1;
- tvc->vc_error = 0;
-#if defined(AFS_LINUX26_ENV)
- tvc->cred = NULL;
-#endif
-#ifdef AFS_TEXT_ENV
- tvc->flushDV.low = tvc->flushDV.high = AFS_MAXDV;
-#endif
- hzero(tvc->mapDV);
- tvc->f.truncPos = AFS_NOTRUNC; /* don't truncate until we need to */
- hzero(tvc->f.m.DataVersion); /* in case we copy it into flushDV */
- tvc->Access = NULL;
- tvc->callback = serverp; /* to minimize chance that clear
- * request is lost */
-#if defined(AFS_DISCON_ENV)
- QZero(&tvc->metadirty);
-#endif
+ /* Thread the vcache onto the VLRU */
i = VCHash(afid);
j = VCHashV(afid);
tvc->hnext = afs_vhashT[i];
afs_vhashT[i] = tvc;
QAdd(&afs_vhashTV[j], &tvc->vhashq);
-
+
if ((VLRU.next->prev != &VLRU) || (VLRU.prev->next != &VLRU)) {
refpanic("NewVCache VLRU inconsistent");
}
refpanic("NewVCache VLRU inconsistent4");
}
vcachegen++;
- /* it should now be safe to drop the xvcache lock */
-#ifdef AFS_OBSD_ENV
- ReleaseWriteLock(&afs_xvcache);
- AFS_GUNLOCK();
- afs_obsd_getnewvnode(tvc); /* includes one refcount */
- AFS_GLOCK();
- ObtainWriteLock(&afs_xvcache,337);
- lockinit(&tvc->rwlock, PINOD, "vcache", 0, 0);
-#endif
-#ifdef AFS_DARWIN_ENV
- ReleaseWriteLock(&afs_xvcache);
- AFS_GUNLOCK();
- afs_darwin_getnewvnode(tvc, seq ? 0 : 1); /* includes one refcount */
- AFS_GLOCK();
- ObtainWriteLock(&afs_xvcache,338);
-#ifdef AFS_DARWIN80_ENV
- LOCKINIT(tvc->rwlock);
-#else
- lockinit(&tvc->rwlock, PINOD, "vcache", 0, 0);
-#endif
-#endif
-#ifdef AFS_FBSD_ENV
- {
- struct vnode *vp;
- ReleaseWriteLock(&afs_xvcache);
- AFS_GUNLOCK();
-#if defined(AFS_FBSD60_ENV)
- if (getnewvnode(MOUNT_AFS, afs_globalVFS, &afs_vnodeops, &vp))
-#elif defined(AFS_FBSD50_ENV)
- if (getnewvnode(MOUNT_AFS, afs_globalVFS, afs_vnodeop_p, &vp))
-#else
- if (getnewvnode(VT_AFS, afs_globalVFS, afs_vnodeop_p, &vp))
-#endif
- panic("afs getnewvnode"); /* can't happen */
-#ifdef AFS_FBSD70_ENV
- /* XXX verified on 80--TODO check on 7x */
- if (!vp->v_mount) {
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); /* !glocked */
- insmntque(vp, afs_globalVFS);
- VOP_UNLOCK(vp, 0);
- }
-#endif
- AFS_GLOCK();
- ObtainWriteLock(&afs_xvcache,339);
- if (tvc->v != NULL) {
- /* I'd like to know if this ever happens...
- * We don't drop global for the rest of this function,
- * so if we do lose the race, the other thread should
- * have found the same vnode and finished initializing
- * the vcache entry. Is it conceivable that this vcache
- * entry could be recycled during this interval? If so,
- * then there probably needs to be some sort of additional
- * mutual exclusion (an Embryonic flag would suffice).
- * -GAW */
- afs_warn("afs_NewVCache: lost the race\n");
- return (tvc);
- }
- tvc->v = vp;
- tvc->v->v_data = tvc;
- lockinit(&tvc->rwlock, PINOD, "vcache", 0, 0);
- }
-#endif
+ /* it should now be safe to drop the xvcache lock - so attach an inode
+ * to this vcache, where necessary */
+ osi_AttachVnode(tvc, seq);
+
+ /* Get a reference count to hold this vcache for the VLRUQ. Note that
+ * we have to do this after attaching the vnode, because the reference
+ * count may be held in the vnode itself */
#if defined(AFS_LINUX22_ENV)
/* Hold it for the LRU (should make count 2) */
- VN_HOLD(AFSTOV(tvc));
+ AFS_FAST_HOLD(tvc);
#elif !(defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV))
VREFCOUNT_SET(tvc, 1); /* us */
#endif
-#ifdef AFS_AIX32_ENV
- LOCK_INIT(&tvc->pvmlock, "vcache pvmlock");
- tvc->vmh = tvc->segid = NULL;
- tvc->credp = NULL;
-#endif
-
-#if defined(AFS_CACHE_BYPASS)
- tvc->cachingStates = 0;
- tvc->cachingTransitions = 0;
-#endif
-
-#ifdef AFS_BOZONLOCK_ENV
-#if defined(AFS_SUN5_ENV)
- rw_init(&tvc->rwlock, "vcache rwlock", RW_DEFAULT, NULL);
-
-#if defined(AFS_SUN55_ENV)
- /* This is required if the kaio (kernel aynchronous io)
- ** module is installed. Inside the kernel, the function
- ** check_vp( common/os/aio.c) checks to see if the kernel has
- ** to provide asynchronous io for this vnode. This
- ** function extracts the device number by following the
- ** v_data field of the vnode. If we do not set this field
- ** then the system panics. The value of the v_data field
- ** is not really important for AFS vnodes because the kernel
- ** does not do asynchronous io for regular files. Hence,
- ** for the time being, we fill up the v_data field with the
- ** vnode pointer itself. */
- tvc->v.v_data = (char *)tvc;
-#endif /* AFS_SUN55_ENV */
-#endif
- afs_BozonInit(&tvc->pvnLock, tvc);
-#endif
-
- /* initialize vnode data, note vrefCount is v.v_count */
-#ifdef AFS_AIX_ENV
- /* Don't forget to free the gnode space */
- tvc->v.v_gnode = gnodepnt =
- (struct gnode *)osi_AllocSmallSpace(sizeof(struct gnode));
- memset(gnodepnt, 0, sizeof(struct gnode));
-#endif
-#ifdef AFS_SGI64_ENV
- memset((void *)&(tvc->vc_bhv_desc), 0, sizeof(tvc->vc_bhv_desc));
- bhv_desc_init(&(tvc->vc_bhv_desc), tvc, tvc, &Afs_vnodeops);
-#ifdef AFS_SGI65_ENV
- vn_bhv_head_init(&(tvc->v.v_bh), "afsvp");
- vn_bhv_insert_initial(&(tvc->v.v_bh), &(tvc->vc_bhv_desc));
-#else
- bhv_head_init(&(tvc->v.v_bh));
- bhv_insert_initial(&(tvc->v.v_bh), &(tvc->vc_bhv_desc));
-#endif
-#ifdef AFS_SGI65_ENV
- tvc->v.v_mreg = tvc->v.v_mregb = (struct pregion *)tvc;
-#ifdef VNODE_TRACING
- tvc->v.v_trace = ktrace_alloc(VNODE_TRACE_SIZE, 0);
-#endif
- init_bitlock(&tvc->v.v_pcacheflag, VNODE_PCACHE_LOCKBIT, "afs_pcache",
- tvc->v.v_number);
- init_mutex(&tvc->v.v_filocksem, MUTEX_DEFAULT, "afsvfl", (long)tvc);
- init_mutex(&tvc->v.v_buf_lock, MUTEX_DEFAULT, "afsvnbuf", (long)tvc);
-#endif
- vnode_pcache_init(&tvc->v);
-#if defined(DEBUG) && defined(VNODE_INIT_BITLOCK)
- /* Above define is never true except in SGI test kernels. */
- init_bitlock(&(tvc->v.v_flag, VLOCK, "vnode", tvc->v.v_number));
-#endif
-#ifdef INTR_KTHREADS
- AFS_VN_INIT_BUF_LOCK(&(tvc->v));
-#endif
-#else
- SetAfsVnode(AFSTOV(tvc));
-#endif /* AFS_SGI64_ENV */
- /*
- * The proper value for mvstat (for root fids) is setup by the caller.
- */
- tvc->mvstat = 0;
- if (afid->Fid.Vnode == 1 && afid->Fid.Unique == 1)
- tvc->mvstat = 2;
- if (afs_globalVFS == 0)
- osi_Panic("afs globalvfs");
-#if !defined(AFS_LINUX22_ENV)
- vSetVfsp(tvc, afs_globalVFS);
-#endif
- vSetType(tvc, VREG);
-#ifdef AFS_AIX_ENV
- tvc->v.v_vfsnext = afs_globalVFS->vfs_vnodes; /* link off vfs */
- tvc->v.v_vfsprev = NULL;
- afs_globalVFS->vfs_vnodes = &tvc->v;
- if (tvc->v.v_vfsnext != NULL)
- tvc->v.v_vfsnext->v_vfsprev = &tvc->v;
- tvc->v.v_next = gnodepnt->gn_vnode; /*Single vnode per gnode for us! */
- gnodepnt->gn_vnode = &tvc->v;
+#if defined (AFS_FBSD_ENV)
+ if (tvc->f.states & CVInit)
#endif
-#if defined(AFS_SGI_ENV)
- VN_SET_DPAGES(&(tvc->v), (struct pfdat *)NULL);
- osi_Assert((tvc->v.v_flag & VINACT) == 0);
- tvc->v.v_flag = 0;
- osi_Assert(VN_GET_PGCNT(&(tvc->v)) == 0);
- osi_Assert(tvc->mapcnt == 0 && tvc->vc_locktrips == 0);
- osi_Assert(tvc->vc_rwlockid == OSI_NO_LOCKID);
- osi_Assert(tvc->v.v_filocks == NULL);
-#if !defined(AFS_SGI65_ENV)
- osi_Assert(tvc->v.v_filocksem == NULL);
-#endif
- osi_Assert(tvc->cred == NULL);
-#ifdef AFS_SGI64_ENV
- vnode_pcache_reinit(&tvc->v);
- tvc->v.v_rdev = NODEV;
-#endif
- vn_initlist((struct vnlist *)&tvc->v);
- tvc->lastr = 0;
-#endif /* AFS_SGI_ENV */
- tvc->dchint = NULL;
- osi_dnlc_purgedp(tvc); /* this may be overkill */
- memset(&(tvc->callsort), 0, sizeof(struct afs_q));
- tvc->slocks = NULL;
- tvc->f.states &=~ CVInit;
- if (seq) {
- tvc->f.states |= CBulkFetching;
- tvc->f.m.Length = seq;
- }
- afs_osi_Wakeup(&tvc->f.states);
+ afs_PostPopulateVCache(tvc, afid, seq);
return tvc;
} /*afs_NewVCache */
* \param doflocks : Do we handle flocks?
*/
void
-afs_FlushActiveVcaches(register afs_int32 doflocks)
+afs_FlushActiveVcaches(afs_int32 doflocks)
{
- register struct vcache *tvc;
- register int i;
- register struct afs_conn *tc;
- register afs_int32 code;
+ struct vcache *tvc;
+ int i;
+ struct afs_conn *tc;
+ afs_int32 code;
afs_ucred_t *cred = NULL;
struct vrequest treq, ureq;
struct AFSVolSync tsync;
*/
/*!
- *
+ *
* Make sure a cache entry is up-to-date status-wise.
- *
+ *
* NOTE: everywhere that calls this can potentially be sped up
* by checking CStatd first, and avoiding doing the InitReq
* if this is up-to-date.
int
afs_VerifyVCache2(struct vcache *avc, struct vrequest *areq)
{
- register struct vcache *tvc;
+ struct vcache *tvc;
AFS_STATCNT(afs_VerifyVCache);
*
*/
static void
-afs_SimpleVStat(register struct vcache *avc,
- register struct AFSFetchStatus *astat, struct vrequest *areq)
+afs_SimpleVStat(struct vcache *avc,
+ struct AFSFetchStatus *astat, struct vrequest *areq)
{
afs_size_t length;
AFS_STATCNT(afs_SimpleVStat);
-#ifdef AFS_SGI_ENV
- if ((avc->execsOrWriters <= 0) && !afs_DirtyPages(avc)
- && !AFS_VN_MAPPED((vnode_t *) avc)) {
-#else
- if ((avc->execsOrWriters <= 0) && !afs_DirtyPages(avc)) {
-#endif
#ifdef AFS_64BIT_CLIENT
FillInt64(length, astat->Length_hi, astat->Length);
#else /* AFS_64BIT_CLIENT */
length = astat->Length;
#endif /* AFS_64BIT_CLIENT */
+
#if defined(AFS_SGI_ENV)
+ if ((avc->execsOrWriters <= 0) && !afs_DirtyPages(avc)
+ && !AFS_VN_MAPPED((vnode_t *) avc)) {
osi_Assert((valusema(&avc->vc_rwlock) <= 0)
&& (OSI_GET_LOCKID() == avc->vc_rwlockid));
if (length < avc->f.m.Length) {
AFS_GLOCK();
ObtainWriteLock(&avc->lock, 67);
}
+ }
#endif
- /* if writing the file, don't fetch over this value */
+
+ if (!afs_DirtyPages(avc)) {
+ /* if actively writing the file, don't fetch over this value */
afs_Trace3(afs_iclSetp, CM_TRACE_SIMPLEVSTAT, ICL_TYPE_POINTER, avc,
ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->f.m.Length),
ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(length));
*/
int
-afs_WriteVCache(register struct vcache *avc,
- register struct AFSStoreStatus *astatus,
+afs_WriteVCache(struct vcache *avc,
+ struct AFSStoreStatus *astatus,
struct vrequest *areq)
{
afs_int32 code;
return code;
} /*afs_WriteVCache */
-#if defined(AFS_DISCON_ENV)
/*!
* Store status info only locally, set the proper disconnection flags
* \note Must be called with a shared lock on the vnode
*/
int
-afs_WriteVCacheDiscon(register struct vcache *avc,
- register struct AFSStoreStatus *astatus,
+afs_WriteVCacheDiscon(struct vcache *avc,
+ struct AFSStoreStatus *astatus,
struct vattr *attrs)
{
afs_int32 code = 0;
return code;
}
-#endif
-
/*!
* Copy astat block into vcache info
*
* \note This code may get dataversion and length out of sync if the file has
- * been modified. This is less than ideal. I haven't thought about it sufficiently
+ * been modified. This is less than ideal. I haven't thought about it sufficiently
* to be certain that it is adequate.
*
* \note Environment: Must be called under a write lock
* \param areq Ptr to associated request.
*/
void
-afs_ProcessFS(register struct vcache *avc,
- register struct AFSFetchStatus *astat, struct vrequest *areq)
+afs_ProcessFS(struct vcache *avc,
+ struct AFSFetchStatus *astat, struct vrequest *areq)
{
afs_size_t length;
AFS_STATCNT(afs_ProcessFS);
/*!
* Get fid from server.
*
- * \param afid
+ * \param afid
* \param areq Request to be passed on.
* \param name Name of ?? to lookup.
* \param OutStatus Fetch status.
- * \param CallBackp
+ * \param CallBackp
* \param serverp
* \param tsyncp
*
* \return Success status of operation.
*/
int
-afs_RemoteLookup(register struct VenusFid *afid, struct vrequest *areq,
+afs_RemoteLookup(struct VenusFid *afid, struct vrequest *areq,
char *name, struct VenusFid *nfid,
struct AFSFetchStatus *OutStatusp,
struct AFSCallBack *CallBackp, struct server **serverp,
{
afs_int32 code;
afs_uint32 start;
- register struct afs_conn *tc;
+ struct afs_conn *tc;
struct AFSFetchStatus OutDirStatus;
XSTATS_DECLS;
if (!name)
- name = ""; /* XXX */
+ name = ""; /* XXX */
do {
tc = afs_Conn(afid, areq, SHARED_LOCK);
if (tc) {
if (serverp)
- *serverp = tc->srvr->server;
+ *serverp = tc->parent->srvr->server;
start = osi_Time();
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_XLOOKUP);
RX_AFS_GUNLOCK();
* of a parent dir cache entry, given a file (to check its access
* control list). It also allows renames to be handled easily by
* locking directories in a constant order.
- *
+ *
* \note NB. NewVCache -> FlushVCache presently (4/10/95) drops the xvcache lock.
*
* \note Might have a vcache structure already, which must
- * already be held by the caller
+ * already be held by the caller
*/
struct vcache *
-afs_GetVCache(register struct VenusFid *afid, struct vrequest *areq,
+afs_GetVCache(struct VenusFid *afid, struct vrequest *areq,
afs_int32 * cached, struct vcache *avc)
{
afs_int32 code, newvcache = 0;
- register struct vcache *tvc;
+ struct vcache *tvc;
struct volume *tvp;
afs_int32 retry;
goto loop;
#endif
}
-
if (tvc) {
if (cached)
*cached = 1;
if (!iheldthelock)
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, current_proc());
/* this is messy. we can call fsync which will try to reobtain this */
- if (VTOAFS(vp) == tvc)
+ if (VTOAFS(vp) == tvc)
ReleaseWriteLock(&tvc->lock);
if (UBCINFOEXISTS(vp)) {
vinvalbuf(vp, V_SAVE, &afs_osi_cred, current_proc(), PINOD, 0);
}
- if (VTOAFS(vp) == tvc)
+ if (VTOAFS(vp) == tvc)
ObtainWriteLock(&tvc->lock, 954);
if (!iheldthelock)
VOP_UNLOCK(vp, LK_EXCLUSIVE, current_proc());
iheldthelock = VOP_ISLOCKED(vp, curthread);
if (!iheldthelock)
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+ AFS_GUNLOCK();
vinvalbuf(vp, V_SAVE, curthread, PINOD, 0);
+ AFS_GLOCK();
if (!iheldthelock)
VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread);
-#elif defined(AFS_FBSD50_ENV)
+#elif defined(AFS_FBSD_ENV)
iheldthelock = VOP_ISLOCKED(vp, curthread);
if (!iheldthelock)
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
vinvalbuf(vp, V_SAVE, osi_curcred(), curthread, PINOD, 0);
if (!iheldthelock)
VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread);
-#elif defined(AFS_FBSD40_ENV)
- iheldthelock = VOP_ISLOCKED(vp, curproc);
- if (!iheldthelock)
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curproc);
- vinvalbuf(vp, V_SAVE, osi_curcred(), curproc, PINOD, 0);
- if (!iheldthelock)
- VOP_UNLOCK(vp, LK_EXCLUSIVE, curproc);
#elif defined(AFS_OBSD_ENV)
iheldthelock = VOP_ISLOCKED(vp, curproc);
if (!iheldthelock)
uvm_vnp_uncache(vp);
if (!iheldthelock)
VOP_UNLOCK(vp, 0, curproc);
+#elif defined(AFS_NBSD40_ENV)
+ iheldthelock = VOP_ISLOCKED(vp);
+ if (!iheldthelock) {
+ VOP_LOCK(vp, LK_EXCLUSIVE | LK_RETRY);
+ }
+ uvm_vnp_uncache(vp);
+ if (!iheldthelock)
+ VOP_UNLOCK(vp, 0);
#endif
}
#endif
* Lookup a vcache by fid. Look inside the cache first, if not
* there, lookup the file on the server, and then get it's fresh
* cache entry.
- *
+ *
* \param afid
- * \param areq
+ * \param areq
* \param cached Is element cached? If NULL, don't answer.
* \param adp
* \param aname
{
afs_int32 code, now, newvcache = 0;
struct VenusFid nfid;
- register struct vcache *tvc;
+ struct vcache *tvc;
struct volume *tvp;
struct AFSFetchStatus OutStatus;
struct AFSCallBack CallBack;
nfid = *afid;
now = osi_Time();
origCBs = afs_allCBs; /* if anything changes, we don't have a cb */
-
+
if (AFS_IS_DISCONNECTED) {
/* printf("Network is down in afs_LookupVcache\n"); */
code = ENETDOWN;
- } else
+ } else
code =
- afs_RemoteLookup(&adp->f.fid, areq, aname, &nfid, &OutStatus,
+ afs_RemoteLookup(&adp->f.fid, areq, aname, &nfid, &OutStatus,
&CallBack, &serverp, &tsync);
#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
afs_int32 getNewFid = 0;
afs_uint32 start;
struct VenusFid nfid;
- register struct vcache *tvc;
+ struct vcache *tvc;
struct server *serverp = 0;
struct AFSFetchStatus OutStatus;
struct AFSCallBack CallBack;
{
int code;
afs_uint32 start = 0;
- register struct afs_conn *tc;
+ struct afs_conn *tc;
struct AFSCallBack CallBack;
struct AFSVolSync tsync;
XSTATS_DECLS;
tc = afs_Conn(afid, areq, SHARED_LOCK);
avc->dchint = NULL; /* invalidate hints */
if (tc) {
- avc->callback = tc->srvr->server;
+ avc->callback = tc->parent->srvr->server;
start = osi_Time();
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_FETCHSTATUS);
RX_AFS_GUNLOCK();
* Nothing interesting.
*/
void
-afs_StuffVcache(register struct VenusFid *afid,
+afs_StuffVcache(struct VenusFid *afid,
struct AFSFetchStatus *OutStatus,
- struct AFSCallBack *CallBack, register struct afs_conn *tc,
+ struct AFSCallBack *CallBack, struct afs_conn *tc,
struct vrequest *areq)
{
- register afs_int32 code, i, newvcache = 0;
- register struct vcache *tvc;
+ afs_int32 code, i, newvcache = 0;
+ struct vcache *tvc;
struct AFSVolSync tsync;
struct volume *tvp;
struct axscache *ac;
* \note Environment: Nothing interesting.
*/
void
-afs_PutVCache(register struct vcache *avc)
+afs_PutVCache(struct vcache *avc)
{
AFS_STATCNT(afs_PutVCache);
#ifdef AFS_DARWIN80_ENV
/*!
* Reset a vcache entry, so local contents are ignored, and the
* server will be reconsulted next time the vcache is used
- *
+ *
* \param avc Pointer to the cache entry to reset
- * \param acred
+ * \param acred
*
* \note avc must be write locked on entry
*/
* \param vcache Enter sleep state.
* \param flag Determines what locks to use.
*
- * \return
+ * \return
*/
static void
findvc_sleep(struct vcache *avc, int flag)
}
}
}
+
+/*!
+ * Add a reference on an existing vcache entry.
+ *
+ * \param tvc Pointer to the vcache.
+ *
+ * \note Environment: Must be called with at least one reference from
+ * elsewhere on the vcache, even if that reference will be dropped.
+ * The global lock is required.
+ *
+ * \return 0 on success, -1 on failure.
+ */
+
+int
+afs_RefVCache(struct vcache *tvc)
+{
+#ifdef AFS_DARWIN80_ENV
+ vnode_t tvp;
+#endif
+
+ /* AFS_STATCNT(afs_RefVCache); */
+
+#ifdef AFS_DARWIN80_ENV
+ tvp = AFSTOV(tvc);
+ if (vnode_get(tvp))
+ return -1;
+ if (vnode_ref(tvp)) {
+ AFS_GUNLOCK();
+ /* AFSTOV(tvc) may be NULL */
+ vnode_put(tvp);
+ AFS_GLOCK();
+ return -1;
+ }
+#else
+ osi_vnhold(tvc, 0);
+#endif
+ return 0;
+} /*afs_RefVCache */
+
/*!
* Find a vcache entry given a fid.
*
afs_FindVCache(struct VenusFid *afid, afs_int32 * retry, afs_int32 flag)
{
- register struct vcache *tvc;
+ struct vcache *tvc;
afs_int32 i;
#ifdef AFS_DARWIN80_ENV
vnode_t tvp;
afs_int32
afs_NFSFindVCache(struct vcache **avcp, struct VenusFid *afid)
{
- register struct vcache *tvc;
+ struct vcache *tvc;
afs_int32 i;
afs_int32 count = 0;
struct vcache *found_tvc = NULL;
tvc = found_tvc;
/* should I have a read lock on the vnode here? */
if (tvc) {
+#ifndef AFS_DARWIN80_ENV
#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
afs_int32 retry = 0;
osi_vnhold(tvc, &retry);
#else
osi_vnhold(tvc, (int *)0); /* already held, above */
#endif
+#endif
/*
* We obtained the xvcache lock above.
*/
afs_vcacheInit(int astatSize)
{
#if !defined(AFS_LINUX22_ENV)
- register struct vcache *tvp;
+ struct vcache *tvp;
#endif
int i;
-#if defined(AFS_LINUX22_ENV)
if (!afs_maxvcount) {
afs_maxvcount = astatSize; /* no particular limit on linux? */
- if (astatSize < afs_maxvcount) {
- afs_maxvcount = astatSize;
- }
}
-#else /* AFS_LINUX22_ENV */
+#if !defined(AFS_LINUX22_ENV)
freeVCList = NULL;
#endif
#if !defined(AFS_LINUX22_ENV)
/* Allocate and thread the struct vcache entries */
- tvp = (struct vcache *)afs_osi_Alloc(astatSize * sizeof(struct vcache));
+ tvp = afs_osi_Alloc(astatSize * sizeof(struct vcache));
+ osi_Assert(tvp != NULL);
memset(tvp, 0, sizeof(struct vcache) * astatSize);
Initial_freeVCList = tvp;
*/
{
- register struct afs_q *tq, *uq = NULL;
- register struct vcache *tvc;
+ struct afs_q *tq, *uq = NULL;
+ struct vcache *tvc;
for (tq = VLRU.prev; tq != &VLRU; tq = uq) {
tvc = QTOV(tq);
uq = QPrev(tq);
int i;
struct vcache *tvc;
int nq=0;
-
+
ObtainWriteLock(&afs_xvcache, 1002); /* XXX - should be a unique number */
-
+
/* Somehow, walk the set of vcaches, with each one coming out as tvc */
for (i = 0; i < VCSIZE; i++) {
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
ReleaseWriteLock(&afs_xvcache);
- afs_FlushVCBs(1);
+ afs_FlushVCBs(2);
}
/*!
*
* Clear the Statd flag from all vcaches
*
- * This function removes the Statd flag from all vcaches. It's used by
+ * This function removes the Statd flag from all vcaches. It's used by
* disconnected mode to tidy up during reconnection
*
*/
{
int i;
struct vcache *tvc;
-
+
ObtainWriteLock(&afs_xvcache, 715);
for (i = 0; i < VCSIZE; i++) {
git://git.openafs.org / openafs.git / blobdiff