#include <afsconfig.h>
#include "afs/param.h"
-RCSID
- ("$Header$");
#include "afs/sysincludes.h" /*Standard vendor system headers */
#include "afsincludes.h" /*AFS-based standard headers */
#include "afs/afs_cbqueue.h"
#include "afs/afs_osidnlc.h"
-#if defined(AFS_OSF_ENV) || defined(AFS_LINUX22_ENV)
afs_int32 afs_maxvcount = 0; /* max number of vcache entries */
afs_int32 afs_vcount = 0; /* number of vcache in use now */
-#endif /* AFS_OSF_ENV */
#ifdef AFS_SGI_ENV
int afsvnumbers = 0;
#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 */
afs_int32 afs_bulkStatsLost;
int afs_norefpanic = 0;
+
+/* 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);
*slept = 0;
AFS_STATCNT(afs_FlushVCache);
afs_Trace2(afs_iclSetp, CM_TRACE_FLUSHV, ICL_TYPE_POINTER, avc,
- ICL_TYPE_INT32, avc->states);
-#ifdef AFS_OSF_ENV
- AFS_GUNLOCK();
- VN_LOCK(AFSTOV(avc));
- AFS_GLOCK();
-#endif
+ ICL_TYPE_INT32, avc->f.states);
code = osi_VM_FlushVCache(avc, slept);
if (code)
goto bad;
- if (avc->states & CVFlushed) {
+ if (avc->f.states & CVFlushed) {
code = EBUSY;
goto bad;
}
refpanic("LRU vs. Free inconsistency");
}
#endif
- avc->states |= CVFlushed;
+ avc->f.states |= CVFlushed;
/* pull the entry out of the lruq and put it on the free list */
QRemove(&avc->vlruq);
/* keep track of # of files that we bulk stat'd, but never used
* before they got recycled.
*/
- if (avc->states & CBulkStat)
+ if (avc->f.states & CBulkStat)
afs_bulkStatsLost++;
vcachegen++;
/* remove entry from the hash chain */
- i = VCHash(&avc->fid);
+ i = VCHash(&avc->f.fid);
uvc = &afs_vhashT[i];
for (wvc = *uvc; wvc; uvc = &wvc->hnext, wvc = *uvc) {
if (avc == wvc) {
vn_reinit(AFSTOV(avc));
#endif
afs_FreeAllAxs(&(avc->Access));
-
- /* we can't really give back callbacks on RO files, since the
- * server only tracks them on a per-volume basis, and we don't
- * know whether we still have some other files from the same
- * volume. */
- if ((avc->states & CRO) == 0 && avc->callback) {
- afs_QueueVCB(avc);
- }
+ afs_QueueVCB(avc);
ObtainWriteLock(&afs_xcbhash, 460);
afs_DequeueCallback(avc); /* remove it from queued callbacks list */
- avc->states &= ~(CStatd | CUnique);
+ avc->f.states &= ~(CStatd | CUnique);
ReleaseWriteLock(&afs_xcbhash);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ if ((avc->f.states & CForeign) || (avc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(avc); /* if it (could be) a directory */
else
osi_dnlc_purgevp(avc);
* optimistic synchronization algorithm
*/
afs_allZaps++;
- if (avc->fid.Fid.Vnode & 1)
+ if (avc->f.fid.Fid.Vnode & 1)
afs_oddZaps++;
else
afs_evenZaps++;
-#if !defined(AFS_OSF_ENV) && !defined(AFS_LINUX22_ENV)
+#if !defined(AFS_LINUX22_ENV)
/* put the entry in the free list */
avc->nextfree = freeVCList;
freeVCList = avc;
if (avc->vlruq.prev || avc->vlruq.next) {
refpanic("LRU vs. Free inconsistency");
}
- avc->states |= CVFlushed;
+ 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)) {
-#if defined(AFS_OSF_ENV)
- VN_UNLOCK(AFSTOV(avc));
-#endif
AFS_RELE(AFSTOV(avc));
+ afs_stats_cmperf.vcacheXAllocs--;
} else {
if (afs_norefpanic) {
- printf("flush vc refcnt < 1");
+ afs_warn("flush vc refcnt < 1");
afs_norefpanic++;
-#if defined(AFS_OSF_ENV)
- (void)vgone(avc, VX_NOSLEEP, NULL);
- AFS_GLOCK();
- VN_UNLOCK(AFSTOV(avc));
-#endif
} else
osi_Panic("flush vc refcnt < 1");
}
-#endif /* AFS_OSF_ENV */
+#endif /* AFS_LINUX22_ENV */
return 0;
bad:
-#ifdef AFS_OSF_ENV
- VN_UNLOCK(AFSTOV(avc));
-#endif
return code;
-
} /*afs_FlushVCache */
#ifndef AFS_SGI_ENV
* \param acred
*/
void
-afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred)
+afs_InactiveVCache(struct vcache *avc, afs_ucred_t *acred)
{
AFS_STATCNT(afs_inactive);
- if (avc->states & CDirty) {
+ if (avc->f.states & CDirty) {
/* we can't keep trying to push back dirty data forever. Give up. */
afs_InvalidateAllSegments(avc); /* turns off dirty bit */
}
- avc->states &= ~CMAPPED; /* mainly used by SunOS 4.0.x */
- avc->states &= ~CDirty; /* Turn it off */
- if (avc->states & CUnlinked) {
+ avc->f.states &= ~CMAPPED; /* mainly used by SunOS 4.0.x */
+ avc->f.states &= ~CDirty; /* Turn it off */
+ if (avc->f.states & CUnlinked) {
if (CheckLock(&afs_xvcache) || CheckLock(&afs_xdcache)) {
- avc->states |= CUnlinkedDel;
+ avc->f.states |= CUnlinkedDel;
return;
}
afs_remunlink(avc, 1); /* ignore any return code */
* \return The allocated afs_cbr.
*/
static struct afs_cbr *afs_cbrSpace = 0;
+/* if alloc limit below changes, fix me! */
+static struct afs_cbr *afs_cbrHeads[2];
struct afs_cbr *
afs_AllocCBR(void)
{
}
tsp[AFS_NCBRS - 1].next = 0;
afs_cbrSpace = tsp;
+ afs_cbrHeads[afs_stats_cmperf.CallBackAlloced] = tsp;
afs_stats_cmperf.CallBackAlloced++;
}
}
struct server *tsp;
int i;
struct vrequest treq;
- struct conn *tc;
+ struct afs_conn *tc;
int safety1, safety2, safety3;
XSTATS_DECLS;
if ((code = afs_InitReq(&treq, afs_osi_credp)))
tfids = afs_osi_Alloc(sizeof(struct AFSFid) * AFS_MAXCBRSCALL);
if (lockit)
- MObtainWriteLock(&afs_xvcb, 273);
+ ObtainWriteLock(&afs_xvcb, 273);
ObtainReadLock(&afs_xserver);
for (i = 0; i < NSERVERS; i++) {
for (safety1 = 0, tsp = afs_servers[i];
cbArray.AFSCBs_val = callBacks;
memset(&callBacks[0], 0, sizeof(callBacks[0]));
callBacks[0].CallBackType = CB_EXCLUSIVE;
- for (safety3 = 0; safety3 < MAXHOSTS * 2; safety3++) {
+ for (safety3 = 0; safety3 < AFS_MAXHOSTS * 2; safety3++) {
tc = afs_ConnByHost(tsp, tsp->cell->fsport,
tsp->cell->cellNum, &treq, 0,
SHARED_LOCK);
ReleaseReadLock(&afs_xserver);
if (lockit)
- MReleaseWriteLock(&afs_xvcb);
+ ReleaseWriteLock(&afs_xvcb);
afs_osi_Free(tfids, sizeof(struct AFSFid) * AFS_MAXCBRSCALL);
return 0;
}
* Called when the xvcache lock is already held.
*
* \param avc vcache entry
- * \return 0 for success < 0 otherwise.
+ * \return 1 if queued, 0 otherwise
*/
static afs_int32
afs_QueueVCB(struct vcache *avc)
{
+ int queued = 0;
struct server *tsp;
struct afs_cbr *tcbp;
AFS_STATCNT(afs_QueueVCB);
+
+ ObtainWriteLock(&afs_xvcb, 274);
+
+ /* we can't really give back callbacks on RO files, since the
+ * server only tracks them on a per-volume basis, and we don't
+ * know whether we still have some other files from the same
+ * volume. */
+ if (!((avc->f.states & CRO) == 0 && avc->callback)) {
+ goto done;
+ }
+
/* The callback is really just a struct server ptr. */
tsp = (struct server *)(avc->callback);
/* we now have a pointer to the server, so we just allocate
* a queue entry and queue it.
*/
- MObtainWriteLock(&afs_xvcb, 274);
tcbp = afs_AllocCBR();
- tcbp->fid = avc->fid.Fid;
+ tcbp->fid = avc->f.fid.Fid;
tcbp->next = tsp->cbrs;
if (tsp->cbrs)
tcbp->pprev = &tsp->cbrs;
afs_InsertHashCBR(tcbp);
+ queued = 1;
+ done:
/* now release locks and return */
- MReleaseWriteLock(&afs_xvcb);
- return 0;
+ ReleaseWriteLock(&afs_xvcb);
+ return queued;
}
struct afs_cbr *cbr, *ncbr;
AFS_STATCNT(afs_RemoveVCB);
- MObtainWriteLock(&afs_xvcb, 275);
+ ObtainWriteLock(&afs_xvcb, 275);
slot = afs_HashCBRFid(&afid->Fid);
ncbr = afs_cbrHashT[slot];
}
}
- MReleaseWriteLock(&afs_xvcb);
+ ReleaseWriteLock(&afs_xvcb);
}
void
We probably need a way to be smarter about this. */
tvc->nextfree = tmpReclaimedVCList;
tmpReclaimedVCList = tvc;
- printf("Reclaim list flush %lx failed: %d\n", (unsigned long) tvc, code);
+ /* printf("Reclaim list flush %lx failed: %d\n", (unsigned long) tvc, code); */
}
- if (tvc->states & (CVInit
+ if (tvc->f.states & (CVInit
#ifdef AFS_DARWIN80_ENV
| CDeadVnode
#endif
)) {
- tvc->states &= ~(CVInit
+ tvc->f.states &= ~(CVInit
#ifdef AFS_DARWIN80_ENV
| CDeadVnode
#endif
);
- afs_osi_Wakeup(&tvc->states);
+ afs_osi_Wakeup(&tvc->f.states);
}
}
if (tmpReclaimedVCList)
#endif
}
-/*!
- * This routine is responsible for allocating a new cache entry
- * from the free list. It formats the cache entry and inserts it
- * into the appropriate hash tables. It must be called with
- * afs_xvcache write-locked so as to prevent several processes from
- * trying to create a new cache entry simultaneously.
- *
- * LOCK: afs_NewVCache afs_xvcache W
- *
- * \param afid The file id of the file whose cache entry is being created.
- *
- * \return The new vcache struct.
- */
-struct vcache *
-afs_NewVCache(struct VenusFid *afid, struct server *serverp)
+int
+afs_ShakeLooseVCaches(afs_int32 anumber)
{
+#if defined(AFS_LINUX22_ENV)
+ afs_int32 i;
struct vcache *tvc;
- afs_int32 i, j;
- afs_int32 anumber = VCACHE_FREE;
-#ifdef AFS_AIX_ENV
- struct gnode *gnodepnt;
-#endif
-#ifdef AFS_OSF_ENV
- struct vcache *nvc;
-#endif /* AFS_OSF_ENV */
struct afs_q *tq, *uq;
int code, fv_slept;
+ afs_int32 target = anumber;
- AFS_STATCNT(afs_NewVCache);
-
- afs_FlushReclaimedVcaches();
-
-#if defined(AFS_OSF_ENV) || defined(AFS_LINUX22_ENV)
-#if defined(AFS_OSF30_ENV) || defined(AFS_LINUX22_ENV)
- if (afs_vcount >= afs_maxvcount)
-#else
- /*
- * If we are using > 33 % of the total system vnodes for AFS vcache
- * entries or we are using the maximum number of vcache entries,
- * then free some. (if our usage is > 33% we should free some, if
- * our usage is > afs_maxvcount, set elsewhere to 0.5*nvnode,
- * we _must_ free some -- no choice).
- */
- if (((3 * afs_vcount) > nvnode) || (afs_vcount >= afs_maxvcount))
-#endif
- {
- int i;
- char *panicstr;
-
+ 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->states & CVFlushed) {
+ if (tvc->f.states & CVFlushed) {
refpanic("CVFlushed on VLRU");
- } else if (i++ > afs_maxvcount) {
+ } else if (!afsd_dynamic_vcaches && i++ > afs_maxvcount) {
refpanic("Exceeded pool of AFS vnodes(VLRU cycle?)");
} else if (QNext(uq) != tq) {
refpanic("VLRU inconsistent");
AFS_GUNLOCK();
#if defined(AFS_LINUX24_ENV)
spin_lock(&dcache_lock);
-#endif
+#endif /* AFS_LINUX24_ENV */
head = &(AFSTOV(tvc))->i_dentry;
restart:
#if defined(AFS_LINUX24_ENV)
spin_unlock(&dcache_lock);
-#endif
+#endif /* AFS_LINUX24_ENV */
if (d_invalidate(dentry) == -EBUSY) {
dput(dentry);
/* perhaps lock and try to continue? (use cur as head?) */
dput(dentry);
#if defined(AFS_LINUX24_ENV)
spin_lock(&dcache_lock);
-#endif
+#endif /* AFS_LINUX24_ENV */
goto restart;
}
#if defined(AFS_LINUX24_ENV)
spin_unlock(&dcache_lock);
-#endif
+#endif /* AFS_LINUX24_ENV */
inuse:
AFS_GLOCK();
}
-#endif
+#endif /* AFS_LINUX22_ENV */
if (VREFCOUNT_GT(tvc,0) && !VREFCOUNT_GT(tvc,1) &&
tvc->opens == 0
- && (tvc->states & CUnlinkedDel) == 0) {
+ && (tvc->f.states & CUnlinkedDel) == 0) {
code = afs_FlushVCache(tvc, &fv_slept);
if (code == 0) {
anumber--;
if (tq == uq)
break;
}
- if (anumber == VCACHE_FREE) {
- printf("afs_NewVCache: warning none freed, using %d of %d\n",
+ if (!afsd_dynamic_vcaches && anumber == target) {
+ afs_warn("afs_ShakeLooseVCaches: warning none freed, using %d of %d\n",
afs_vcount, afs_maxvcount);
- if (afs_vcount >= afs_maxvcount) {
- printf("afs_NewVCache - none freed\n");
- return NULL;
- }
}
} /* finished freeing up space */
+/*
+ printf("recycled %d entries\n", target-anumber);
+*/
+#endif
+ return 0;
+}
/* Alloc new vnode. */
-#if defined(AFS_LINUX22_ENV)
+
+static struct vcache *
+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_NewVCache: no more inodes");
+ osi_Panic("afs_AllocVCache: no more inodes");
AFS_GLOCK();
-#if defined(STRUCT_SUPER_HAS_ALLOC_INODE)
+#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
-}
+
+ afs_vcount++;
+
+ /* track the peak */
+ if (afsd_dynamic_vcaches && afs_maxvcount < afs_vcount) {
+ afs_maxvcount = afs_vcount;
+ /*printf("peak vnodes: %d\n", afs_maxvcount);*/
+ }
+
+ afs_stats_cmperf.vcacheXAllocs++; /* count in case we have a leak */
#else
- AFS_GUNLOCK();
- if (getnewvnode(MOUNT_AFS, &Afs_vnodeops, &nvc)) {
- /* What should we do ???? */
- osi_Panic("afs_NewVCache: no more vnodes");
+ /* 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
}
- AFS_GLOCK();
+#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;
+ afs_osi_Free(tmp, sizeof(struct afs_slotlist));
+ } else {
+ tvc->diskSlot = afs_nextVcacheSlot++;
+ }
+#endif
- tvc = nvc;
- tvc->nextfree = NULL;
+ return tvc;
+}
+
+/*!
+ * This routine is responsible for allocating a new cache entry
+ * from the free list. It formats the cache entry and inserts it
+ * into the appropriate hash tables. It must be called with
+ * afs_xvcache write-locked so as to prevent several processes from
+ * trying to create a new cache entry simultaneously.
+ *
+ * LOCK: afs_NewVCache afs_xvcache W
+ *
+ * \param afid The file id of the file whose cache entry is being created.
+ *
+ * \return The new vcache struct.
+ */
+
+static_inline struct vcache *
+afs_NewVCache_int(struct VenusFid *afid, struct server *serverp, int seq)
+{
+ struct vcache *tvc;
+ afs_int32 i, j;
+ afs_int32 anumber = VCACHE_FREE;
+#ifdef AFS_AIX_ENV
+ struct gnode *gnodepnt;
#endif
- afs_vcount++;
-#else /* AFS_OSF_ENV */
+#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) {
+ afs_ShakeLooseVCaches(anumber);
+ if (afs_vcount >= afs_maxvcount) {
+ afs_warn("afs_NewVCache - none freed\n");
+ return NULL;
+ }
+ }
+ tvc = afs_AllocVCache();
+#else /* AFS_LINUX22_ENV */
/* pull out a free cache entry */
if (!freeVCList) {
int loop = 0;
tvc = QTOV(tq);
uq = QPrev(tq);
- if (tvc->states & CVFlushed) {
+ 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->states & CVInit) {
+ } else if (tvc->f.states & CVInit) {
continue;
}
|| ((VREFCOUNT(tvc) == 1) &&
(UBCINFOEXISTS(AFSTOV(tvc))))
#endif
- && tvc->opens == 0 && (tvc->states & CUnlinkedDel) == 0) {
+ && 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);
code = EBUSY;
} else
code = 0;
-#else
+#else /* AFS_DARWIN80_ENV */
/*
* vgone() reclaims the vnode, which calls afs_FlushVCache(),
* then it puts the vnode 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
+#else /* AFS_DARWIN80_ENV || AFS_XBSD_ENV */
code = afs_FlushVCache(tvc, &fv_slept);
-#endif
+#endif /* AFS_DARWIN80_ENV || AFS_XBSD_ENV */
if (code == 0) {
anumber--;
}
} /* end of if (!freeVCList) */
if (!freeVCList) {
- /* 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(UKERNEL)
- tvc->v = NULL; /* important to clean this, or use memset 0 */
-#endif
-#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 */
+ tvc = afs_AllocVCache();
} else {
tvc = freeVCList; /* take from free list */
freeVCList = tvc->nextfree;
tvc->nextfree = NULL;
} /* end of if (!freeVCList) */
-#endif /* AFS_OSF_ENV */
+#endif /* AFS_LINUX22_ENV */
#if defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV)
if (tvc->v)
panic("afs_NewVCache(): free vcache with vnode attached");
#endif
-#if !defined(AFS_SGI_ENV) && !defined(AFS_OSF_ENV) && !defined(AFS_LINUX22_ENV)
- memset((char *)tvc, 0, sizeof(struct vcache));
+#if !defined(AFS_SGI_ENV) && !defined(AFS_LINUX22_ENV)
+
+#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");
AFS_RWLOCK_INIT(&tvc->vlock, "vcache vlock");
#endif /* defined(AFS_SUN5_ENV) */
- tvc->parentVnode = 0;
tvc->mvid = NULL;
tvc->linkData = NULL;
tvc->cbExpires = 0;
tvc->opens = 0;
tvc->execsOrWriters = 0;
tvc->flockCount = 0;
- tvc->anyAccess = 0;
- tvc->states = CVInit;
+ tvc->f.states = CVInit;
tvc->last_looker = 0;
- tvc->fid = *afid;
+ 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->truncPos = AFS_NOTRUNC; /* don't truncate until we need to */
- hzero(tvc->m.DataVersion); /* in case we copy it into flushDV */
+ 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)
- tvc->ddirty_next = NULL;
- tvc->ddirty_flags = 0;
+ QZero(&tvc->metadirty);
#endif
i = VCHash(afid);
#ifdef AFS_OBSD_ENV
ReleaseWriteLock(&afs_xvcache);
AFS_GUNLOCK();
- afs_nbsd_getnewvnode(tvc); /* includes one refcount */
+ afs_obsd_getnewvnode(tvc); /* includes one refcount */
AFS_GLOCK();
ObtainWriteLock(&afs_xvcache,337);
lockinit(&tvc->rwlock, PINOD, "vcache", 0, 0);
#ifdef AFS_DARWIN_ENV
ReleaseWriteLock(&afs_xvcache);
AFS_GUNLOCK();
- afs_darwin_getnewvnode(tvc); /* includes one refcount */
+ afs_darwin_getnewvnode(tvc, seq ? 0 : 1); /* includes one refcount */
AFS_GLOCK();
ObtainWriteLock(&afs_xvcache,338);
#ifdef AFS_DARWIN80_ENV
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) {
* then there probably needs to be some sort of additional
* mutual exclusion (an Embryonic flag would suffice).
* -GAW */
- printf("afs_NewVCache: lost the race\n");
+ afs_warn("afs_NewVCache: lost the race\n");
return (tvc);
}
tvc->v = vp;
}
#endif
-#if defined(AFS_OSF_ENV) || defined(AFS_LINUX22_ENV)
+#if defined(AFS_LINUX22_ENV)
/* Hold it for the LRU (should make count 2) */
VN_HOLD(AFSTOV(tvc));
-#else /* AFS_OSF_ENV */
-#if !(defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV))
+#elif !(defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV))
VREFCOUNT_SET(tvc, 1); /* us */
-#endif /* AFS_XBSD_ENV */
-#endif /* AFS_OSF_ENV */
+#endif
+
#ifdef AFS_AIX32_ENV
LOCK_INIT(&tvc->pvmlock, "vcache pvmlock");
tvc->vmh = tvc->segid = NULL;
/* Don't forget to free the gnode space */
tvc->v.v_gnode = gnodepnt =
(struct gnode *)osi_AllocSmallSpace(sizeof(struct gnode));
- memset((char *)gnodepnt, 0, 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));
#endif
vnode_pcache_init(&tvc->v);
#if defined(DEBUG) && defined(VNODE_INIT_BITLOCK)
- /* Above define is never true execpt in SGI test kernels. */
- init_bitlock(&(tvc->v.v_flag, VLOCK, "vnode", tvc->v.v_number);
+ /* 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));
+ AFS_VN_INIT_BUF_LOCK(&(tvc->v));
#endif
#else
SetAfsVnode(AFSTOV(tvc));
tvc->v.v_next = gnodepnt->gn_vnode; /*Single vnode per gnode for us! */
gnodepnt->gn_vnode = &tvc->v;
#endif
-#if defined(AFS_DUX40_ENV)
- insmntque(tvc, afs_globalVFS, &afs_ubcops);
-#else
-#ifdef AFS_OSF_ENV
- /* Is this needed??? */
- insmntque(tvc, afs_globalVFS);
-#endif /* AFS_OSF_ENV */
-#endif /* AFS_DUX40_ENV */
-#ifdef AFS_FBSD70_ENV
-#ifndef AFS_FBSD80_ENV /* yup. they put it back. */
- insmntque(AFSTOV(tvc), afs_globalVFS);
-#endif
-#endif
#if defined(AFS_SGI_ENV)
VN_SET_DPAGES(&(tvc->v), (struct pfdat *)NULL);
osi_Assert((tvc->v.v_flag & VINACT) == 0);
#endif /* AFS_SGI_ENV */
tvc->dchint = NULL;
osi_dnlc_purgedp(tvc); /* this may be overkill */
- memset((char *)&(tvc->callsort), 0, sizeof(struct afs_q));
+ memset(&(tvc->callsort), 0, sizeof(struct afs_q));
tvc->slocks = NULL;
- tvc->states &=~ CVInit;
- afs_osi_Wakeup(&tvc->states);
+ tvc->f.states &=~ CVInit;
+ if (seq) {
+ tvc->f.states |= CBulkFetching;
+ tvc->f.m.Length = seq;
+ }
+ afs_osi_Wakeup(&tvc->f.states);
return tvc;
-
} /*afs_NewVCache */
+struct vcache *
+afs_NewVCache(struct VenusFid *afid, struct server *serverp)
+{
+ return afs_NewVCache_int(afid, serverp, 0);
+}
+
+struct vcache *
+afs_NewBulkVCache(struct VenusFid *afid, struct server *serverp, int seq)
+{
+ return afs_NewVCache_int(afid, serverp, seq);
+}
+
/*!
* ???
*
{
register struct vcache *tvc;
register int i;
- register struct conn *tc;
+ register struct afs_conn *tc;
register afs_int32 code;
- register struct AFS_UCRED *cred = NULL;
+ afs_ucred_t *cred = NULL;
struct vrequest treq, ureq;
struct AFSVolSync tsync;
int didCore;
ObtainReadLock(&afs_xvcache);
for (i = 0; i < VCSIZE; i++) {
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
- if (tvc->states & CVInit) continue;
+ if (tvc->f.states & CVInit) continue;
#ifdef AFS_DARWIN80_ENV
- if (tvc->states & CDeadVnode &&
- (tvc->states & (CCore|CUnlinkedDel) ||
+ if (tvc->f.states & CDeadVnode &&
+ (tvc->f.states & (CCore|CUnlinkedDel) ||
tvc->flockCount)) panic("Dead vnode has core/unlinkedel/flock");
#endif
if (doflocks && tvc->flockCount != 0) {
afs_InitReq(&treq, afs_osi_credp);
treq.flags |= O_NONBLOCK;
- tc = afs_Conn(&tvc->fid, &treq, SHARED_LOCK);
+ tc = afs_Conn(&tvc->f.fid, &treq, SHARED_LOCK);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_EXTENDLOCK);
RX_AFS_GUNLOCK();
code =
RXAFS_ExtendLock(tc->id,
- (struct AFSFid *)&tvc->fid.Fid,
+ (struct AFSFid *)&tvc->f.fid.Fid,
&tsync);
RX_AFS_GLOCK();
XSTATS_END_TIME;
} else
code = -1;
} while (afs_Analyze
- (tc, code, &tvc->fid, &treq,
+ (tc, code, &tvc->f.fid, &treq,
AFS_STATS_FS_RPCIDX_EXTENDLOCK, SHARED_LOCK, NULL));
ReleaseWriteLock(&tvc->lock);
#endif
}
didCore = 0;
- if ((tvc->states & CCore) || (tvc->states & CUnlinkedDel)) {
+ if ((tvc->f.states & CCore) || (tvc->f.states & CUnlinkedDel)) {
/*
* Don't let it evaporate in case someone else is in
* this code. Also, drop the afs_xvcache lock while
AFS_RWLOCK((vnode_t *) tvc, VRWLOCK_WRITE);
#endif
ObtainWriteLock(&tvc->lock, 52);
- if (tvc->states & CCore) {
- tvc->states &= ~CCore;
+ if (tvc->f.states & CCore) {
+ tvc->f.states &= ~CCore;
/* XXXX Find better place-holder for cred XXXX */
- cred = (struct AFS_UCRED *)tvc->linkData;
+ cred = (afs_ucred_t *)tvc->linkData;
tvc->linkData = NULL; /* XXX */
afs_InitReq(&ureq, cred);
afs_Trace2(afs_iclSetp, CM_TRACE_ACTCCORE,
osi_FlushText(tvc);
didCore = 1;
if (code && code != VNOVNODE) {
- afs_StoreWarn(code, tvc->fid.Fid.Volume,
+ afs_StoreWarn(code, tvc->f.fid.Fid.Volume,
/* /dev/console */ 1);
}
- } else if (tvc->states & CUnlinkedDel) {
+ } else if (tvc->f.states & CUnlinkedDel) {
/*
* Ignore errors
*/
AFS_STATCNT(afs_VerifyVCache);
-#if defined(AFS_OSF_ENV)
- ObtainReadLock(&avc->lock);
- if (afs_IsWired(avc)) {
- ReleaseReadLock(&avc->lock);
- return 0;
- }
- ReleaseReadLock(&avc->lock);
-#endif /* AFS_OSF_ENV */
/* otherwise we must fetch the status info */
ObtainWriteLock(&avc->lock, 53);
- if (avc->states & CStatd) {
+ if (avc->f.states & CStatd) {
ReleaseWriteLock(&avc->lock);
return 0;
}
ObtainWriteLock(&afs_xcbhash, 461);
- avc->states &= ~(CStatd | CUnique);
+ avc->f.states &= ~(CStatd | CUnique);
avc->callback = NULL;
afs_DequeueCallback(avc);
ReleaseWriteLock(&afs_xcbhash);
* it's possible that the contents of this directory, or this
* file's name have changed, thus invalidating the dnlc contents.
*/
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ if ((avc->f.states & CForeign) || (avc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(avc);
else
osi_dnlc_purgevp(avc);
/* fetch the status info */
- tvc = afs_GetVCache(&avc->fid, areq, NULL, avc);
+ tvc = afs_GetVCache(&avc->f.fid, areq, NULL, avc);
if (!tvc)
return ENOENT;
/* Put it back; caller has already incremented vrefCount */
#if defined(AFS_SGI_ENV)
osi_Assert((valusema(&avc->vc_rwlock) <= 0)
&& (OSI_GET_LOCKID() == avc->vc_rwlockid));
- if (length < avc->m.Length) {
+ if (length < avc->f.m.Length) {
vnode_t *vp = (vnode_t *) avc;
osi_Assert(WriteLocked(&avc->lock));
#endif
/* if 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->m.Length),
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->f.m.Length),
ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(length));
- avc->m.Length = length;
- avc->m.Date = astat->ClientModTime;
+ avc->f.m.Length = length;
+ avc->f.m.Date = astat->ClientModTime;
}
- avc->m.Owner = astat->Owner;
- avc->m.Group = astat->Group;
- avc->m.Mode = astat->UnixModeBits;
+ avc->f.m.Owner = astat->Owner;
+ avc->f.m.Group = astat->Group;
+ avc->f.m.Mode = astat->UnixModeBits;
if (vType(avc) == VREG) {
- avc->m.Mode |= S_IFREG;
+ avc->f.m.Mode |= S_IFREG;
} else if (vType(avc) == VDIR) {
- avc->m.Mode |= S_IFDIR;
+ avc->f.m.Mode |= S_IFDIR;
} else if (vType(avc) == VLNK) {
- avc->m.Mode |= S_IFLNK;
- if ((avc->m.Mode & 0111) == 0)
+ avc->f.m.Mode |= S_IFLNK;
+ if ((avc->f.m.Mode & 0111) == 0)
avc->mvstat = 1;
}
- if (avc->states & CForeign) {
+ if (avc->f.states & CForeign) {
struct axscache *ac;
- avc->anyAccess = astat->AnonymousAccess;
+ avc->f.anyAccess = astat->AnonymousAccess;
#ifdef badidea
if ((astat->CallerAccess & ~astat->AnonymousAccess))
/* USED TO SAY :
afs_AddAxs(avc->Access, areq->uid, astat->CallerAccess);
}
-
} /*afs_SimpleVStat */
struct vrequest *areq)
{
afs_int32 code;
- struct conn *tc;
+ struct afs_conn *tc;
struct AFSFetchStatus OutStatus;
struct AFSVolSync tsync;
XSTATS_DECLS;
AFS_STATCNT(afs_WriteVCache);
afs_Trace2(afs_iclSetp, CM_TRACE_WVCACHE, ICL_TYPE_POINTER, avc,
- ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->m.Length));
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->f.m.Length));
do {
- tc = afs_Conn(&avc->fid, areq, SHARED_LOCK);
+ tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_STORESTATUS);
RX_AFS_GUNLOCK();
code =
- RXAFS_StoreStatus(tc->id, (struct AFSFid *)&avc->fid.Fid,
+ RXAFS_StoreStatus(tc->id, (struct AFSFid *)&avc->f.fid.Fid,
astatus, &OutStatus, &tsync);
RX_AFS_GLOCK();
XSTATS_END_TIME;
} else
code = -1;
} while (afs_Analyze
- (tc, code, &avc->fid, areq, AFS_STATS_FS_RPCIDX_STORESTATUS,
+ (tc, code, &avc->f.fid, areq, AFS_STATS_FS_RPCIDX_STORESTATUS,
SHARED_LOCK, NULL));
UpgradeSToWLock(&avc->lock, 20);
* it thought we were doing this after fetching new status
* over a file being written.
*/
- avc->m.Date = OutStatus.ClientModTime;
+ avc->f.m.Date = OutStatus.ClientModTime;
} else {
/* failure, set up to check with server next time */
ObtainWriteLock(&afs_xcbhash, 462);
afs_DequeueCallback(avc);
- avc->states &= ~(CStatd | CUnique); /* turn off stat valid flag */
+ avc->f.states &= ~(CStatd | CUnique); /* turn off stat valid flag */
ReleaseWriteLock(&afs_xcbhash);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ if ((avc->f.states & CForeign) || (avc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(avc); /* if it (could be) a directory */
}
ConvertWToSLock(&avc->lock);
*
* \note Must be called with a shared lock on the vnode
*/
-int afs_WriteVCacheDiscon(register struct vcache *avc,
- register struct AFSStoreStatus *astatus,
- struct vattr *attrs)
+int
+afs_WriteVCacheDiscon(register struct vcache *avc,
+ register struct AFSStoreStatus *astatus,
+ struct vattr *attrs)
{
afs_int32 code = 0;
afs_int32 flags = 0;
/* Set attributes. */
if (astatus->Mask & AFS_SETMODTIME) {
- avc->m.Date = astatus->ClientModTime;
+ avc->f.m.Date = astatus->ClientModTime;
flags |= VDisconSetTime;
}
if (astatus->Mask & AFS_SETOWNER) {
- printf("Not allowed yet. \n");
- //avc->m.Owner = astatus->Owner;
+ /* printf("Not allowed yet. \n"); */
+ /*avc->f.m.Owner = astatus->Owner;*/
}
if (astatus->Mask & AFS_SETGROUP) {
- printf("Not allowed yet. \n");
- //avc->m.Group = astatus->Group;
+ /* printf("Not allowed yet. \n"); */
+ /*avc->f.m.Group = astatus->Group;*/
}
if (astatus->Mask & AFS_SETMODE) {
- avc->m.Mode = astatus->UnixModeBits;
+ avc->f.m.Mode = astatus->UnixModeBits;
#if 0 /* XXX: Leaving this out, so it doesn't mess up the file type flag.*/
if (vType(avc) == VREG) {
- avc->m.Mode |= S_IFREG;
+ avc->f.m.Mode |= S_IFREG;
} else if (vType(avc) == VDIR) {
- avc->m.Mode |= S_IFDIR;
+ avc->f.m.Mode |= S_IFDIR;
} else if (vType(avc) == VLNK) {
- avc->m.Mode |= S_IFLNK;
- if ((avc->m.Mode & 0111) == 0)
+ avc->f.m.Mode |= S_IFLNK;
+ if ((avc->f.m.Mode & 0111) == 0)
avc->mvstat = 1;
}
#endif
flags |= VDisconTrunc;
}
- ObtainWriteLock(&afs_DDirtyVCListLock, 701);
-
- if (flags) {
- /* Add to disconnected dirty list and set dirty flag.*/
- if (!avc->ddirty_flags ||
- (avc->ddirty_flags == VDisconShadowed)) {
- /* Not in dirty list. */
- AFS_DISCON_ADD_DIRTY(avc, 1);
- }
-
- avc->ddirty_flags |= flags;
- }
-
- ReleaseWriteLock(&afs_DDirtyVCListLock);
+ if (flags)
+ afs_DisconAddDirty(avc, flags, 1);
/* XXX: How about the rest of the fields? */
* values.
*/
afs_Trace3(afs_iclSetp, CM_TRACE_PROCESSFS, ICL_TYPE_POINTER, avc,
- ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->m.Length),
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->f.m.Length),
ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(length));
- avc->m.Length = length;
- avc->m.Date = astat->ClientModTime;
- }
- hset64(avc->m.DataVersion, astat->dataVersionHigh, astat->DataVersion);
- avc->m.Owner = astat->Owner;
- avc->m.Mode = astat->UnixModeBits;
- avc->m.Group = astat->Group;
- avc->m.LinkCount = astat->LinkCount;
+ avc->f.m.Length = length;
+ avc->f.m.Date = astat->ClientModTime;
+ }
+ hset64(avc->f.m.DataVersion, astat->dataVersionHigh, astat->DataVersion);
+ avc->f.m.Owner = astat->Owner;
+ avc->f.m.Mode = astat->UnixModeBits;
+ avc->f.m.Group = astat->Group;
+ avc->f.m.LinkCount = astat->LinkCount;
if (astat->FileType == File) {
vSetType(avc, VREG);
- avc->m.Mode |= S_IFREG;
+ avc->f.m.Mode |= S_IFREG;
} else if (astat->FileType == Directory) {
vSetType(avc, VDIR);
- avc->m.Mode |= S_IFDIR;
+ avc->f.m.Mode |= S_IFDIR;
} else if (astat->FileType == SymbolicLink) {
- if (afs_fakestat_enable && (avc->m.Mode & 0111) == 0) {
+ if (afs_fakestat_enable && (avc->f.m.Mode & 0111) == 0) {
vSetType(avc, VDIR);
- avc->m.Mode |= S_IFDIR;
+ avc->f.m.Mode |= S_IFDIR;
} else {
vSetType(avc, VLNK);
- avc->m.Mode |= S_IFLNK;
+ avc->f.m.Mode |= S_IFLNK;
}
- if ((avc->m.Mode & 0111) == 0) {
+ if ((avc->f.m.Mode & 0111) == 0) {
avc->mvstat = 1;
}
}
- avc->anyAccess = astat->AnonymousAccess;
+ avc->f.anyAccess = astat->AnonymousAccess;
#ifdef badidea
if ((astat->CallerAccess & ~astat->AnonymousAccess))
/* USED TO SAY :
{
afs_int32 code;
afs_uint32 start;
- register struct conn *tc;
+ register struct afs_conn *tc;
struct AFSFetchStatus OutDirStatus;
XSTATS_DECLS;
if (!name)
if (tvc) {
if (cached)
*cached = 1;
- osi_Assert((tvc->states & CVInit) == 0);
+ osi_Assert((tvc->f.states & CVInit) == 0);
/* If we are in readdir, return the vnode even if not statd */
- if ((tvc->states & CStatd) || afs_InReadDir(tvc)) {
+ if ((tvc->f.states & CStatd) || afs_InReadDir(tvc)) {
ReleaseSharedLock(&afs_xvcache);
return tvc;
}
newvcache = 1;
ConvertWToSLock(&afs_xvcache);
- if (!tvc)
+ if (tvc == NULL)
{
ReleaseSharedLock(&afs_xvcache);
return NULL;
ObtainWriteLock(&tvc->lock, 54);
- if (tvc->states & CStatd) {
+ if (tvc->f.states & CStatd) {
ReleaseWriteLock(&tvc->lock);
return tvc;
}
-#if defined(AFS_OSF_ENV)
- if (afs_IsWired(tvc)) {
- ReleaseWriteLock(&tvc->lock);
- return tvc;
- }
-#endif /* AFS_OSF_ENV */
#ifdef AFS_DARWIN80_ENV
/* Darwin 8.0 only has bufs in nfs, so we shouldn't have to worry about them.
What about ubc? */
if (glocked)
AFS_GLOCK();
}
- vinvalbuf(vp, V_SAVE, curthread, PINOD, 0);
+ vinvalbuf(vp, V_SAVE, PINOD, 0); /* changed late in 8.0-CURRENT */
if (!iheldthelock)
VOP_UNLOCK(vp, 0);
#elif defined(AFS_FBSD60_ENV)
#endif
ObtainWriteLock(&afs_xcbhash, 464);
- tvc->states &= ~CUnique;
+ tvc->f.states &= ~CUnique;
tvc->callback = 0;
afs_DequeueCallback(tvc);
ReleaseWriteLock(&afs_xcbhash);
if (tvp) {
if ((tvp->states & VForeign)) {
if (newvcache)
- tvc->states |= CForeign;
+ tvc->f.states |= CForeign;
if (newvcache && (tvp->rootVnode == afid->Fid.Vnode)
&& (tvp->rootUnique == afid->Fid.Unique)) {
tvc->mvstat = 2;
}
}
if (tvp->states & VRO)
- tvc->states |= CRO;
+ tvc->f.states |= CRO;
if (tvp->states & VBackup)
- tvc->states |= CBackup;
+ tvc->f.states |= CBackup;
/* now copy ".." entry back out of volume structure, if necessary */
if (tvc->mvstat == 2 && tvp->dotdot.Fid.Volume != 0) {
if (!tvc->mvid)
if (afs_DynrootNewVnode(tvc, &OutStatus)) {
afs_ProcessFS(tvc, &OutStatus, areq);
- tvc->states |= CStatd | CUnique;
- tvc->parentVnode = OutStatus.ParentVnode;
- tvc->parentUnique = OutStatus.ParentUnique;
+ tvc->f.states |= CStatd | CUnique;
+ tvc->f.parent.vnode = OutStatus.ParentVnode;
+ tvc->f.parent.unique = OutStatus.ParentUnique;
code = 0;
} else {
if (AFS_IS_DISCONNECTED) {
- if (AFS_IS_DISCON_RW) {
- if (vType(tvc) == VDIR)
- OutStatus.FileType = Directory;
-
- code = tvc?0:ENOENT;
- } else {
- /* Nothing to do otherwise...*/
- code = ENETDOWN;
- printf("Network is down in afs_GetCache");
- }
+ /* Nothing to do otherwise...*/
+ code = ENETDOWN;
+ /* printf("Network is down in afs_GetCache"); */
} else
code = afs_FetchStatus(tvc, afid, areq, &OutStatus);
* its parent.
*/
if (!code && OutStatus.FileType != Directory &&
- !tvc->parentVnode) {
- tvc->parentVnode = OutStatus.ParentVnode;
- tvc->parentUnique = OutStatus.ParentUnique;
+ !tvc->f.parent.vnode) {
+ tvc->f.parent.vnode = OutStatus.ParentVnode;
+ tvc->f.parent.unique = OutStatus.ParentUnique;
+ /* XXX - SXW - It's conceivable we should mark ourselves
+ * as dirty again here, incase we've been raced
+ * out of the FetchStatus call.
+ */
}
}
}
}
ObtainReadLock(&tvc->lock);
- if (tvc->states & CStatd) {
+ if (tvc->f.states & CStatd) {
if (cached) {
*cached = 1;
}
ReleaseReadLock(&tvc->lock);
return tvc;
}
- tvc->states &= ~CUnique;
+ tvc->f.states &= ~CUnique;
ReleaseReadLock(&tvc->lock);
afs_PutVCache(tvc);
origCBs = afs_allCBs; /* if anything changes, we don't have a cb */
if (AFS_IS_DISCONNECTED) {
- printf("Network is down in afs_LookupVcache\n");
+ /* printf("Network is down in afs_LookupVcache\n"); */
code = ENETDOWN;
} else
code =
- afs_RemoteLookup(&adp->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)
if (tvp) {
if ((tvp->states & VForeign)) {
if (newvcache)
- tvc->states |= CForeign;
+ tvc->f.states |= CForeign;
if (newvcache && (tvp->rootVnode == afid->Fid.Vnode)
&& (tvp->rootUnique == afid->Fid.Unique))
tvc->mvstat = 2;
}
if (tvp->states & VRO)
- tvc->states |= CRO;
+ tvc->f.states |= CRO;
if (tvp->states & VBackup)
- tvc->states |= CBackup;
+ tvc->f.states |= CBackup;
/* now copy ".." entry back out of volume structure, if necessary */
if (tvc->mvstat == 2 && tvp->dotdot.Fid.Volume != 0) {
if (!tvc->mvid)
if (code) {
ObtainWriteLock(&afs_xcbhash, 465);
afs_DequeueCallback(tvc);
- tvc->states &= ~(CStatd | CUnique);
+ tvc->f.states &= ~(CStatd | CUnique);
ReleaseWriteLock(&afs_xcbhash);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ if ((tvc->f.states & CForeign) || (tvc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(tvc); /* if it (could be) a directory */
if (tvp)
afs_PutVolume(tvp, READ_LOCK);
if (CallBack.ExpirationTime) {
tvc->callback = serverp;
tvc->cbExpires = CallBack.ExpirationTime + now;
- tvc->states |= CStatd | CUnique;
- tvc->states &= ~CBulkFetching;
+ tvc->f.states |= CStatd | CUnique;
+ tvc->f.states &= ~CBulkFetching;
afs_QueueCallback(tvc, CBHash(CallBack.ExpirationTime), tvp);
- } else if (tvc->states & CRO) {
+ } else if (tvc->f.states & CRO) {
/* adapt gives us an hour. */
tvc->cbExpires = 3600 + osi_Time();
- /*XXX*/ tvc->states |= CStatd | CUnique;
- tvc->states &= ~CBulkFetching;
+ /*XXX*/ tvc->f.states |= CStatd | CUnique;
+ tvc->f.states &= ~CBulkFetching;
afs_QueueCallback(tvc, CBHash(3600), tvp);
} else {
tvc->callback = NULL;
afs_DequeueCallback(tvc);
- tvc->states &= ~(CStatd | CUnique);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ tvc->f.states &= ~(CStatd | CUnique);
+ if ((tvc->f.states & CForeign) || (tvc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(tvc); /* if it (could be) a directory */
}
} else {
afs_DequeueCallback(tvc);
- tvc->states &= ~CStatd;
- tvc->states &= ~CUnique;
+ tvc->f.states &= ~CStatd;
+ tvc->f.states &= ~CUnique;
tvc->callback = NULL;
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ if ((tvc->f.states & CForeign) || (tvc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(tvc); /* if it (could be) a directory */
}
ReleaseWriteLock(&afs_xcbhash);
struct AFSCallBack CallBack;
struct AFSVolSync tsync;
int origCBs = 0;
-#ifdef AFS_OSF_ENV
- int vg;
-#endif
#ifdef AFS_DARWIN80_ENV
vnode_t tvp;
#endif
ObtainSharedLock(&afs_xvcache, 7);
i = VCHash(afid);
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
- if (!FidCmp(&(tvc->fid), afid)) {
- if (tvc->states & CVInit) {
+ if (!FidCmp(&(tvc->f.fid), afid)) {
+ if (tvc->f.states & CVInit) {
ReleaseSharedLock(&afs_xvcache);
- afs_osi_Sleep(&tvc->states);
+ afs_osi_Sleep(&tvc->f.states);
goto rootvc_loop;
}
-#ifdef AFS_OSF_ENV
- /* Grab this vnode, possibly reactivating from the free list */
- /* for the present (95.05.25) everything on the hash table is
- * definitively NOT in the free list -- at least until afs_reclaim
- * can be safely implemented */
- AFS_GUNLOCK();
- vg = vget(AFSTOV(tvc)); /* this bumps ref count */
- AFS_GLOCK();
- if (vg)
- continue;
-#endif /* AFS_OSF_ENV */
#ifdef AFS_DARWIN80_ENV
- if (tvc->states & CDeadVnode) {
- ReleaseSharedLock(&afs_xvcache);
- afs_osi_Sleep(&tvc->states);
- goto rootvc_loop;
- }
+ if (tvc->f.states & CDeadVnode) {
+ if (!(tvc->f.states & CBulkFetching)) {
+ ReleaseSharedLock(&afs_xvcache);
+ afs_osi_Sleep(&tvc->f.states);
+ goto rootvc_loop;
+ }
+ }
tvp = AFSTOV(tvc);
if (vnode_get(tvp)) /* this bumps ref count */
continue;
AFS_GLOCK();
continue;
}
+ if (tvc->f.states & (CBulkFetching|CDeadVnode)) {
+ AFS_GUNLOCK();
+ vnode_recycle(AFSTOV(tvc));
+ AFS_GLOCK();
+ }
#endif
break;
}
}
- if (!haveStatus && (!tvc || !(tvc->states & CStatd))) {
+ if (!haveStatus && (!tvc || !(tvc->f.states & CStatd))) {
/* Mount point no longer stat'd or unknown. FID may have changed. */
-#ifdef AFS_OSF_ENV
- if (tvc)
- AFS_RELE(AFSTOV(tvc));
-#endif
getNewFid = 1;
ReleaseSharedLock(&afs_xvcache);
#ifdef AFS_DARWIN80_ENV
if (cached)
*cached = 1;
afs_stats_cmperf.vcacheHits++;
-#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN80_ENV)
+#if defined(AFS_DARWIN80_ENV)
/* we already bumped the ref count in the for loop above */
-#else /* AFS_OSF_ENV */
+#else /* AFS_DARWIN80_ENV */
osi_vnhold(tvc, 0);
#endif
UpgradeSToWLock(&afs_xvcache, 24);
ReleaseWriteLock(&afs_xvcache);
- if (tvc->states & CStatd) {
+ if (tvc->f.states & CStatd) {
return tvc;
} else {
ObtainReadLock(&tvc->lock);
- tvc->states &= ~CUnique;
+ tvc->f.states &= ~CUnique;
tvc->callback = NULL; /* redundant, perhaps */
ReleaseReadLock(&tvc->lock);
}
afs_FreeAllAxs(&(tvc->Access));
if (newvcache)
- tvc->states |= CForeign;
+ tvc->f.states |= CForeign;
if (tvolp->states & VRO)
- tvc->states |= CRO;
+ tvc->f.states |= CRO;
if (tvolp->states & VBackup)
- tvc->states |= CBackup;
+ tvc->f.states |= CBackup;
/* now copy ".." entry back out of volume structure, if necessary */
if (newvcache && (tvolp->rootVnode == afid->Fid.Vnode)
&& (tvolp->rootUnique == afid->Fid.Unique)) {
ObtainWriteLock(&afs_xcbhash, 467);
afs_DequeueCallback(tvc);
tvc->callback = NULL;
- tvc->states &= ~(CStatd | CUnique);
+ tvc->f.states &= ~(CStatd | CUnique);
ReleaseWriteLock(&afs_xcbhash);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ if ((tvc->f.states & CForeign) || (tvc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(tvc); /* if it (could be) a directory */
ReleaseWriteLock(&tvc->lock);
afs_PutVCache(tvc);
ObtainWriteLock(&afs_xcbhash, 468);
if (origCBs == afs_allCBs) {
- tvc->states |= CTruth;
+ tvc->f.states |= CTruth;
tvc->callback = serverp;
if (CallBack.ExpirationTime != 0) {
tvc->cbExpires = CallBack.ExpirationTime + start;
- tvc->states |= CStatd;
- tvc->states &= ~CBulkFetching;
+ tvc->f.states |= CStatd;
+ tvc->f.states &= ~CBulkFetching;
afs_QueueCallback(tvc, CBHash(CallBack.ExpirationTime), tvolp);
- } else if (tvc->states & CRO) {
+ } else if (tvc->f.states & CRO) {
/* adapt gives us an hour. */
tvc->cbExpires = 3600 + osi_Time();
- /*XXX*/ tvc->states |= CStatd;
- tvc->states &= ~CBulkFetching;
+ /*XXX*/ tvc->f.states |= CStatd;
+ tvc->f.states &= ~CBulkFetching;
afs_QueueCallback(tvc, CBHash(3600), tvolp);
}
} else {
afs_DequeueCallback(tvc);
tvc->callback = NULL;
- tvc->states &= ~(CStatd | CUnique);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ tvc->f.states &= ~(CStatd | CUnique);
+ if ((tvc->f.states & CForeign) || (tvc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(tvc); /* if it (could be) a directory */
}
ReleaseWriteLock(&afs_xcbhash);
* \note The vcache must be write locked.
*/
void
-afs_UpdateStatus(struct vcache *avc,
- struct VenusFid *afid,
- struct vrequest *areq,
- struct AFSFetchStatus *Outsp,
- struct AFSCallBack *acb,
- afs_uint32 start)
+afs_UpdateStatus(struct vcache *avc, struct VenusFid *afid,
+ struct vrequest *areq, struct AFSFetchStatus *Outsp,
+ struct AFSCallBack *acb, afs_uint32 start)
{
struct volume *volp;
volp = afs_GetVolume(afid, areq, READ_LOCK);
ObtainWriteLock(&afs_xcbhash, 469);
- avc->states |= CTruth;
+ avc->f.states |= CTruth;
if (avc->callback /* check for race */ ) {
if (acb->ExpirationTime != 0) {
avc->cbExpires = acb->ExpirationTime + start;
- avc->states |= CStatd;
- avc->states &= ~CBulkFetching;
+ avc->f.states |= CStatd;
+ avc->f.states &= ~CBulkFetching;
afs_QueueCallback(avc, CBHash(acb->ExpirationTime), volp);
- } else if (avc->states & CRO) {
+ } else if (avc->f.states & CRO) {
/* ordinary callback on a read-only volume -- AFS 3.2 style */
avc->cbExpires = 3600 + start;
- avc->states |= CStatd;
- avc->states &= ~CBulkFetching;
+ avc->f.states |= CStatd;
+ avc->f.states &= ~CBulkFetching;
afs_QueueCallback(avc, CBHash(3600), volp);
} else {
afs_DequeueCallback(avc);
avc->callback = NULL;
- avc->states &= ~(CStatd | CUnique);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ avc->f.states &= ~(CStatd | CUnique);
+ if ((avc->f.states & CForeign) || (avc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(avc); /* if it (could be) a directory */
}
} else {
afs_DequeueCallback(avc);
avc->callback = NULL;
- avc->states &= ~(CStatd | CUnique);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ avc->f.states &= ~(CStatd | CUnique);
+ if ((avc->f.states & CForeign) || (avc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(avc); /* if it (could be) a directory */
}
ReleaseWriteLock(&afs_xcbhash);
if (volp)
afs_PutVolume(volp, READ_LOCK);
-
}
/*!
{
int code;
afs_uint32 start = 0;
- register struct conn *tc;
+ register struct afs_conn *tc;
struct AFSCallBack CallBack;
struct AFSVolSync tsync;
XSTATS_DECLS;
void
afs_StuffVcache(register struct VenusFid *afid,
struct AFSFetchStatus *OutStatus,
- struct AFSCallBack *CallBack, register struct conn *tc,
+ struct AFSCallBack *CallBack, register struct afs_conn *tc,
struct vrequest *areq)
{
register afs_int32 code, i, newvcache = 0;
ReleaseSharedLock(&afs_xvcache);
ObtainWriteLock(&tvc->lock, 58);
- tvc->states &= ~CStatd;
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ tvc->f.states &= ~CStatd;
+ if ((tvc->f.states & CForeign) || (tvc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(tvc); /* if it (could be) a directory */
/* Is it always appropriate to throw away all the access rights? */
tvp = afs_GetVolume(afid, areq, READ_LOCK);
if (tvp) {
if (newvcache && (tvp->states & VForeign))
- tvc->states |= CForeign;
+ tvc->f.states |= CForeign;
if (tvp->states & VRO)
- tvc->states |= CRO;
+ tvc->f.states |= CRO;
if (tvp->states & VBackup)
- tvc->states |= CBackup;
+ tvc->f.states |= CBackup;
/*
* Now, copy ".." entry back out of volume structure, if
* necessary
ObtainWriteLock(&afs_xcbhash, 470);
if (CallBack->ExpirationTime != 0) {
tvc->cbExpires = CallBack->ExpirationTime + osi_Time() - 1;
- tvc->states |= CStatd;
- tvc->states &= ~CBulkFetching;
+ tvc->f.states |= CStatd;
+ tvc->f.states &= ~CBulkFetching;
afs_QueueCallback(tvc, CBHash(CallBack->ExpirationTime), tvp);
- } else if (tvc->states & CRO) {
+ } else if (tvc->f.states & CRO) {
/* old-fashioned AFS 3.2 style */
tvc->cbExpires = 3600 + osi_Time();
- /*XXX*/ tvc->states |= CStatd;
- tvc->states &= ~CBulkFetching;
+ /*XXX*/ tvc->f.states |= CStatd;
+ tvc->f.states &= ~CBulkFetching;
afs_QueueCallback(tvc, CBHash(3600), tvp);
} else {
afs_DequeueCallback(tvc);
tvc->callback = NULL;
- tvc->states &= ~(CStatd | CUnique);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ tvc->f.states &= ~(CStatd | CUnique);
+ if ((tvc->f.states & CForeign) || (tvc->f.fid.Fid.Vnode & 1))
osi_dnlc_purgedp(tvc); /* if it (could be) a directory */
}
ReleaseWriteLock(&afs_xcbhash);
/*!
+ * 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
+ *
+ * \note avc must be write locked on entry
+ */
+void
+afs_ResetVCache(struct vcache *avc, afs_ucred_t *acred)
+{
+ ObtainWriteLock(&afs_xcbhash, 456);
+ afs_DequeueCallback(avc);
+ avc->f.states &= ~(CStatd | CDirty); /* next reference will re-stat */
+ ReleaseWriteLock(&afs_xcbhash);
+ /* now find the disk cache entries */
+ afs_TryToSmush(avc, acred, 1);
+ osi_dnlc_purgedp(avc);
+ if (avc->linkData && !(avc->f.states & CCore)) {
+ afs_osi_Free(avc->linkData, strlen(avc->linkData) + 1);
+ avc->linkData = NULL;
+ }
+}
+
+/*!
* Sleepa when searching for a vcache. Releases all the pending locks,
* sleeps then obtains the previously released locks.
*
*
* \return
*/
-static void findvc_sleep(struct vcache *avc, int flag) {
+static void
+findvc_sleep(struct vcache *avc, int flag)
+{
+ int fstates = avc->f.states;
if (flag & IS_SLOCK) {
ReleaseSharedLock(&afs_xvcache);
} else {
ReleaseReadLock(&afs_xvcache);
}
}
- afs_osi_Sleep(&avc->states);
+ if (flag & FIND_CDEAD) {
+ ObtainWriteLock(&afs_xvcache, 342);
+ afs_FlushReclaimedVcaches();
+ if (fstates == avc->f.states) {
+ ReleaseWriteLock(&afs_xvcache);
+ afs_osi_Sleep(&avc->f.states);
+ } else
+ ReleaseWriteLock(&afs_xvcache);
+ } else
+ afs_osi_Sleep(&avc->f.states);
if (flag & IS_SLOCK) {
ObtainSharedLock(&afs_xvcache, 341);
} else {
register struct vcache *tvc;
afs_int32 i;
-#if defined( AFS_OSF_ENV)
- int vg;
-#endif
#ifdef AFS_DARWIN80_ENV
vnode_t tvp;
#endif
i = VCHash(afid);
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
if (FidMatches(afid, tvc)) {
- if (tvc->states & CVInit) {
+ if (tvc->f.states & CVInit) {
findvc_sleep(tvc, flag);
goto findloop;
}
-#ifdef AFS_OSF_ENV
- /* Grab this vnode, possibly reactivating from the free list */
- AFS_GUNLOCK();
- vg = vget(AFSTOV(tvc));
- AFS_GLOCK();
- if (vg)
- continue;
-#endif /* AFS_OSF_ENV */
#ifdef AFS_DARWIN80_ENV
- if (tvc->states & CDeadVnode) {
- findvc_sleep(tvc, flag);
- goto findloop;
- }
+ if (tvc->f.states & CDeadVnode) {
+ if (!(flag & FIND_CDEAD)) {
+ findvc_sleep(tvc, flag);
+ goto findloop;
+ }
+ }
tvp = AFSTOV(tvc);
if (vnode_get(tvp))
continue;
AFS_GLOCK();
continue;
}
+ if (tvc->f.states & (CBulkFetching|CDeadVnode)) {
+ AFS_GUNLOCK();
+ vnode_recycle(AFSTOV(tvc));
+ AFS_GLOCK();
+ }
#endif
break;
}
if (tvc) {
if (retry)
*retry = 0;
-#if !defined(AFS_OSF_ENV) && !defined(AFS_DARWIN80_ENV)
+#if !defined(AFS_DARWIN80_ENV)
osi_vnhold(tvc, retry); /* already held, above */
if (retry && *retry)
return 0;
#endif
#if defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN80_ENV)
- tvc->states |= CUBCinit;
+ tvc->f.states |= CUBCinit;
AFS_GUNLOCK();
if (UBCINFOMISSING(AFSTOV(tvc)) ||
UBCINFORECLAIMED(AFSTOV(tvc))) {
ubc_info_init(AFSTOV(tvc));
}
AFS_GLOCK();
- tvc->states &= ~CUBCinit;
+ tvc->f.states &= ~CUBCinit;
#endif
/*
* only move to front of vlru if we have proper vcache locking)
afs_int32 i;
afs_int32 count = 0;
struct vcache *found_tvc = NULL;
-#ifdef AFS_OSF_ENV
- int vg;
-#endif
#ifdef AFS_DARWIN80_ENV
vnode_t tvp;
#endif
i = VCHash(afid);
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
/* Match only on what we have.... */
- if (((tvc->fid.Fid.Vnode & 0xffff) == afid->Fid.Vnode)
- && (tvc->fid.Fid.Volume == afid->Fid.Volume)
- && ((tvc->fid.Fid.Unique & 0xffffff) == afid->Fid.Unique)
- && (tvc->fid.Cell == afid->Cell)) {
- if (tvc->states & CVInit) {
+ if (((tvc->f.fid.Fid.Vnode & 0xffff) == afid->Fid.Vnode)
+ && (tvc->f.fid.Fid.Volume == afid->Fid.Volume)
+ && ((tvc->f.fid.Fid.Unique & 0xffffff) == afid->Fid.Unique)
+ && (tvc->f.fid.Cell == afid->Cell)) {
+ if (tvc->f.states & CVInit) {
ReleaseSharedLock(&afs_xvcache);
- afs_osi_Sleep(&tvc->states);
+ afs_osi_Sleep(&tvc->f.states);
goto loop;
}
-#ifdef AFS_OSF_ENV
- /* Grab this vnode, possibly reactivating from the free list */
- AFS_GUNLOCK();
- vg = vget(AFSTOV(tvc));
- AFS_GLOCK();
- if (vg) {
- /* This vnode no longer exists. */
- continue;
- }
-#endif /* AFS_OSF_ENV */
#ifdef AFS_DARWIN80_ENV
- if (tvc->states & CDeadVnode) {
- ReleaseSharedLock(&afs_xvcache);
- afs_osi_Sleep(&tvc->states);
- goto loop;
- }
+ if (tvc->f.states & CDeadVnode) {
+ if (!(tvc->f.states & CBulkFetching)) {
+ ReleaseSharedLock(&afs_xvcache);
+ afs_osi_Sleep(&tvc->f.states);
+ goto loop;
+ }
+ }
tvp = AFSTOV(tvc);
if (vnode_get(tvp)) {
/* This vnode no longer exists. */
AFS_GLOCK();
continue;
}
+ if (tvc->f.states & (CBulkFetching|CDeadVnode)) {
+ AFS_GUNLOCK();
+ vnode_recycle(AFSTOV(tvc));
+ AFS_GLOCK();
+ }
#endif /* AFS_DARWIN80_ENV */
count++;
if (found_tvc) {
/* Duplicates */
-#ifdef AFS_OSF_ENV
- /* Drop our reference counts. */
- vrele(AFSTOV(tvc));
- vrele(AFSTOV(found_tvc));
-#endif
afs_duplicate_nfs_fids++;
ReleaseSharedLock(&afs_xvcache);
#ifdef AFS_DARWIN80_ENV
goto loop;
}
#else
-#if !defined(AFS_OSF_ENV)
osi_vnhold(tvc, (int *)0); /* already held, above */
#endif
-#endif
/*
* We obtained the xvcache lock above.
*/
void
afs_vcacheInit(int astatSize)
{
+#if !defined(AFS_LINUX22_ENV)
register struct vcache *tvp;
+#endif
int i;
-#if defined(AFS_OSF_ENV) || defined(AFS_LINUX22_ENV)
- if (!afs_maxvcount) {
#if defined(AFS_LINUX22_ENV)
+ if (!afs_maxvcount) {
afs_maxvcount = astatSize; /* no particular limit on linux? */
-#elif defined(AFS_OSF30_ENV)
- afs_maxvcount = max_vnodes / 2; /* limit ourselves to half the total */
-#else
- afs_maxvcount = nvnode / 2; /* limit ourselves to half the total */
-#endif
if (astatSize < afs_maxvcount) {
afs_maxvcount = astatSize;
}
}
-#else /* AFS_OSF_ENV */
+#else /* AFS_LINUX22_ENV */
freeVCList = NULL;
#endif
AFS_RWLOCK_INIT(&afs_xvcache, "afs_xvcache");
LOCK_INIT(&afs_xvcb, "afs_xvcb");
-#if !defined(AFS_OSF_ENV) && !defined(AFS_LINUX22_ENV)
+#if !defined(AFS_LINUX22_ENV)
/* Allocate and thread the struct vcache entries */
tvp = (struct vcache *)afs_osi_Alloc(astatSize * sizeof(struct vcache));
- memset((char *)tvp, 0, sizeof(struct vcache) * astatSize);
+ memset(tvp, 0, sizeof(struct vcache) * astatSize);
Initial_freeVCList = tvp;
freeVCList = &(tvp[0]);
tvp[i].nextfree = &(tvp[i + 1]);
}
tvp[astatSize - 1].nextfree = NULL;
-#ifdef KERNEL_HAVE_PIN
+# ifdef KERNEL_HAVE_PIN
pin((char *)tvp, astatSize * sizeof(struct vcache)); /* XXX */
-#endif
+# endif
#endif
#if defined(AFS_SGI_ENV)
shutdown_vcache(void)
{
int i;
- struct afs_cbr *tsp, *nsp;
+ struct afs_cbr *tsp;
/*
- * XXX We may potentially miss some of the vcaches because if when there're no
- * free vcache entries and all the vcache entries are active ones then we allocate
- * an additional one - admittedly we almost never had that occur.
+ * XXX We may potentially miss some of the vcaches because if when
+ * there are no free vcache entries and all the vcache entries are active
+ * ones then we allocate an additional one - admittedly we almost never
+ * had that occur.
*/
{
- register struct afs_q *tq, *uq;
+ register struct afs_q *tq, *uq = NULL;
register struct vcache *tvc;
for (tq = VLRU.prev; tq != &VLRU; tq = uq) {
tvc = QTOV(tq);
tvc->linkData = 0;
}
- afs_FreeAllAxs(&(tvc->Access));
+ if (tvc->Access)
+ afs_FreeAllAxs(&(tvc->Access));
}
afs_vhashT[i] = 0;
}
/*
* Free any leftover callback queue
*/
- for (tsp = afs_cbrSpace; tsp; tsp = nsp) {
- nsp = tsp->next;
+ for (i = 0; i < afs_stats_cmperf.CallBackAlloced; i++) {
+ tsp = afs_cbrHeads[i];
+ afs_cbrHeads[i] = 0;
afs_osi_Free((char *)tsp, AFS_NCBRS * sizeof(struct afs_cbr));
}
afs_cbrSpace = 0;
-#if !defined(AFS_OSF_ENV) && !defined(AFS_LINUX22_ENV)
+#if !defined(AFS_LINUX22_ENV)
afs_osi_Free(Initial_freeVCList, afs_cacheStats * sizeof(struct vcache));
-#endif
-#ifdef KERNEL_HAVE_PIN
+
+# ifdef KERNEL_HAVE_PIN
unpin(Initial_freeVCList, afs_cacheStats * sizeof(struct vcache));
-#endif
+# endif
-#if !defined(AFS_OSF_ENV) && !defined(AFS_LINUX22_ENV)
freeVCList = Initial_freeVCList = 0;
#endif
+
AFS_RWLOCK_INIT(&afs_xvcache, "afs_xvcache");
LOCK_INIT(&afs_xvcb, "afs_xvcb");
QInit(&VLRU);
QInit(&afs_vhashTV[i]);
}
-#ifdef AFS_DISCON_ENV
-void afs_DisconGiveUpCallbacks() {
+void
+afs_DisconGiveUpCallbacks(void)
+{
int i;
struct vcache *tvc;
int nq=0;
/* 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) {
- if ((tvc->states & CRO) == 0 && tvc->callback) {
- /* XXX - should we check if the callback has expired here? */
- afs_QueueVCB(tvc);
+ if (afs_QueueVCB(tvc)) {
tvc->callback = NULL;
- tvc->states &- ~(CStatd | CUnique);
nq++;
}
}
}
- /*printf("%d callbacks to be discarded. queued ... ", nq);*/
- afs_FlushVCBs(0);
-
+
ReleaseWriteLock(&afs_xvcache);
- /*printf("gone\n");*/
+
+ afs_FlushVCBs(1);
}
-#endif
+/*!
+ *
+ * Clear the Statd flag from all vcaches
+ *
+ * This function removes the Statd flag from all vcaches. It's used by
+ * disconnected mode to tidy up during reconnection
+ *
+ */
+void
+afs_ClearAllStatdFlag(void)
+{
+ int i;
+ struct vcache *tvc;
+
+ ObtainWriteLock(&afs_xvcache, 715);
+
+ for (i = 0; i < VCSIZE; i++) {
+ for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
+ tvc->f.states &= ~(CStatd|CUnique);
+ }
+ }
+ ReleaseWriteLock(&afs_xvcache);
+}
git://git.openafs.org / openafs.git / blobdiff