/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
*
*/
#include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
RCSID("$Header$");
-#include "../afs/sysincludes.h" /*Standard vendor system headers*/
-#include "../afs/afsincludes.h" /*AFS-based standard headers*/
-#include "../afs/afs_stats.h"
-#include "../afs/afs_cbqueue.h"
-#include "../afs/afs_osidnlc.h"
+#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"
#ifdef AFS_OSF_ENV
afs_int32 afs_maxvcount = 0; /* max number of vcache entries */
afs_int32 afs_vcount = 0; /* number of vcache in use now */
-#if defined(AFS_OSF30_ENV)
-extern int max_vnodes; /* number of total system vnodes */
-#else
-extern int nvnode; /* number of total system vnodes */
-#endif
-#ifndef AFS_OSF30_ENV
-extern int numvnodes; /* number vnodes in use now */
-#endif
#endif /* AFS_OSF_ENV */
+
#ifdef AFS_SGI_ENV
int afsvnumbers = 0;
#endif
-/* Imported variables */
-extern struct server *afs_servers[NSERVERS];
-extern afs_rwlock_t afs_xserver;
-extern afs_rwlock_t afs_xcbhash;
-extern struct vcache *afs_globalVp;
-#ifdef AFS_OSF_ENV
-extern struct mount *afs_globalVFS;
-extern struct vnodeops Afs_vnodeops;
-#elif defined(AFS_DARWIN_ENV)
-extern struct mount *afs_globalVFS;
-#else
-extern struct vfs *afs_globalVFS;
-#endif /* AFS_OSF_ENV */
-#if defined(AFS_DUX40_ENV)
-extern struct vfs_ubcops afs_ubcops;
-#endif
-#ifdef AFS_SGI62_ENV
-extern struct vnodeops Afs_vnodeops;
-#endif
#ifdef AFS_SGI64_ENV
char *makesname();
#endif /* AFS_SGI64_ENV */
-
+
/* Exported variables */
afs_rwlock_t afs_xvcache; /*Lock: alloc new stat cache entries*/
afs_lock_t afs_xvcb; /*Lock: fids on which there are callbacks*/
* afs_xvcache lock must be held for writing upon entry to
* prevent people from changing the vrefCount field, and to
* protect the lruq and hnext fields.
- * LOCK: afs_FlushVCache afs_xvcache W
+ * LOCK: afs_FlushVCache afs_xvcache W
* REFCNT: vcache ref count must be zero on entry except for osf1
* RACE: lock is dropped and reobtained, permitting race in caller
*/
{ /*afs_FlushVCache*/
register afs_int32 i, code;
- register struct vcache **uvc, *wvc, *tvc;
+ register struct vcache **uvc, *wvc;
*slept = 0;
AFS_STATCNT(afs_FlushVCache);
ICL_TYPE_INT32, avc->states);
#ifdef AFS_OSF_ENV
AFS_GUNLOCK();
- VN_LOCK((struct vnode *)avc);
+ VN_LOCK(AFSTOV(avc));
AFS_GLOCK();
#endif
if (avc->mvid) osi_FreeSmallSpace(avc->mvid);
avc->mvid = (struct VenusFid*)0;
if (avc->linkData) {
- afs_osi_Free(avc->linkData, strlen(avc->linkData)+1);
- avc->linkData = NULL;
+ afs_osi_Free(avc->linkData, strlen(avc->linkData)+1);
+ avc->linkData = NULL;
+ }
+#if defined(AFS_OBSD_ENV)
+ /* OK, there are no internal vrefCounts, so there shouldn't
+ be any more refs here. */
+ if (avc->v) {
+ avc->v->v_data = NULL; /* remove from vnode */
+ avc->v = NULL; /* also drop the ptr to vnode */
}
+#endif
afs_FreeAllAxs(&(avc->Access));
- /* we can't really give back callbacks on RO files, since the
+ /* 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. */
avc->states &= ~(CStatd | CUnique);
ReleaseWriteLock(&afs_xcbhash);
afs_symhint_inval(avc);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
- osi_dnlc_purgedp (avc); /* if it (could be) a directory */
- else
- osi_dnlc_purgevp (avc);
+ if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ osi_dnlc_purgedp (avc); /* if it (could be) a directory */
+ else
+ osi_dnlc_purgevp (avc);
/*
* Next, keep track of which vnodes we've deleted for create's
if (avc->vlruq.prev || avc->vlruq.next) {
refpanic ("LRU vs. Free inconsistency");
}
-#else
+#else
/* This should put it back on the vnode free list since usecount is 1 */
afs_vcount--;
vSetType(avc, VREG);
if (VREFCOUNT(avc) > 0) {
- VN_UNLOCK((struct vnode *)avc);
- AFS_RELE((struct vnode *)avc);
+ VN_UNLOCK(AFSTOV(avc));
+ AFS_RELE(AFSTOV(avc));
} else {
if (afs_norefpanic) {
printf ("flush vc refcnt < 1");
afs_norefpanic++;
- (void) vgone(avc, VX_NOSLEEP, (struct vnodeops *) 0);
+ (void) vgone(avc, VX_NOSLEEP, NULL);
AFS_GLOCK();
- VN_UNLOCK((struct vnode *)avc);
+ VN_UNLOCK(AFSTOV(avc));
}
else osi_Panic ("flush vc refcnt < 1");
}
bad:
#ifdef AFS_OSF_ENV
- VN_UNLOCK((struct vnode *)avc);
+ VN_UNLOCK(AFSTOV(avc));
#endif
return code;
*/
void afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred)
{
- extern afs_rwlock_t afs_xdcache, afs_xvcache;
-
AFS_STATCNT(afs_inactive);
if (avc->states & CDirty) {
/* we can't keep trying to push back dirty data forever. Give up. */
- afs_InvalidateAllSegments(avc, 1/*set lock*/); /* turns off dirty bit */
+ 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) {
- if (CheckLock(&afs_xvcache) || CheckLock(&afs_xdcache)) {
+ if (CheckLock(&afs_xvcache) || CheckLock(&afs_xdcache)) {
avc->states |= CUnlinkedDel;
- return;
+ return;
}
afs_remunlink(avc, 1); /* ignore any return code */
}
* held, so we don't have to worry about blocking in osi_Alloc.
*/
static struct afs_cbr *afs_cbrSpace = 0;
-struct afs_cbr *afs_AllocCBR() {
+struct afs_cbr *afs_AllocCBR(void)
+{
register struct afs_cbr *tsp;
int i;
*
* Environment: the xvcb lock is held over these calls.
*/
-afs_FreeCBR(asp)
-register struct afs_cbr *asp; {
+int afs_FreeCBR(register struct afs_cbr *asp)
+{
asp->next = afs_cbrSpace;
afs_cbrSpace = asp;
return 0;
* Environment: holds xvcb lock over RPC to guard against race conditions
* when a new callback is granted for the same file later on.
*/
-afs_int32 afs_FlushVCBs (afs_int32 lockit)
+afs_int32 afs_FlushVCBs (afs_int32 lockit)
{
struct AFSFid tfids[AFS_MAXCBRSCALL];
struct AFSCallBack callBacks[1];
struct vrequest treq;
struct conn *tc;
int safety1, safety2, safety3;
- extern int afs_totalServers;
XSTATS_DECLS
- if (code = afs_InitReq(&treq, &afs_osi_cred)) return code;
+ if ((code = afs_InitReq(&treq, &afs_osi_cred))) return code;
treq.flags |= O_NONBLOCK;
if (lockit) MObtainWriteLock(&afs_xvcb,273);
ObtainReadLock(&afs_xserver);
for(i=0; i<NSERVERS; i++) {
for(safety1 = 0, tsp = afs_servers[i];
- tsp && safety1 < afs_totalServers+10; tsp=tsp->next, safety1++) {
+ tsp && safety1 < afs_totalServers+10; tsp=tsp->next, safety1++) {
/* don't have any */
if (tsp->cbrs == (struct afs_cbr *) 0) continue;
callBacks[0].CallBackType = CB_EXCLUSIVE;
for (safety3 = 0; safety3 < MAXHOSTS*2; safety3++) {
tc = afs_ConnByHost(tsp, tsp->cell->fsport,
- tsp->cell->cell, &treq, 0,
+ tsp->cell->cellNum, &treq, 0,
SHARED_LOCK);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_GIVEUPCALLBACKS);
-#ifdef RX_ENABLE_LOCKS
- AFS_GUNLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GUNLOCK();
code = RXAFS_GiveUpCallBacks(tc->id, &fidArray,
&cbArray);
-#ifdef RX_ENABLE_LOCKS
- AFS_GLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GLOCK();
XSTATS_END_TIME;
}
else code = -1;
* entries locked.
*/
-afs_RemoveVCB(afid)
- register struct VenusFid *afid;
-
-{ /*afs_RemoveVCB*/
-
- register int i, j;
+int afs_RemoveVCB(struct VenusFid *afid)
+{
+ register int i;
register struct server *tsp;
register struct afs_cbr *tcbrp;
struct afs_cbr **lcbrpp;
for(i=0;i<NSERVERS;i++) {
for(tsp=afs_servers[i]; tsp; tsp=tsp->next) {
/* if cell is known, and is wrong, then skip this server */
- if (tsp->cell && tsp->cell->cell != afid->Cell) continue;
+ if (tsp->cell && tsp->cell->cellNum != afid->Cell) continue;
/*
* Otherwise, iterate through file IDs we're sending to the
ReleaseReadLock(&afs_xserver);
MReleaseWriteLock(&afs_xvcb);
return 0;
+}
+
+#ifdef AFS_LINUX22_ENV
-} /*afs_RemoveVCB*/
+static void __shrink_dcache_parent(struct dentry * parent)
+{
+ struct dentry *this_parent = parent;
+ struct list_head *next;
+ int found = 0;
+ LIST_HEAD(afs_dentry_unused);
+
+repeat:
+ next = this_parent->d_subdirs.next;
+resume:
+ while (next != &this_parent->d_subdirs) {
+ struct list_head *tmp = next;
+ struct dentry *dentry = list_entry(tmp, struct dentry, d_child);
+ next = tmp->next;
+ if (!DCOUNT(dentry)) {
+ list_del(&dentry->d_lru);
+ list_add(&dentry->d_lru, afs_dentry_unused.prev);
+ found++;
+ }
+ /*
+ * Descend a level if the d_subdirs list is non-empty.
+ */
+ if (!list_empty(&dentry->d_subdirs)) {
+ this_parent = dentry;
+ goto repeat;
+ }
+ }
+ /*
+ * All done at this level ... ascend and resume the search.
+ */
+ if (this_parent != parent) {
+ next = this_parent->d_child.next;
+ this_parent = this_parent->d_parent;
+ goto resume;
+ }
+ for (;;) {
+ struct dentry *dentry;
+ struct list_head *tmp;
+ tmp = afs_dentry_unused.prev;
+
+ if (tmp == &afs_dentry_unused)
+ break;
+#ifdef AFS_LINUX24_ENV
+ list_del_init(tmp);
+#else
+ list_del(tmp);
+ INIT_LIST_HEAD(tmp);
+#endif /* AFS_LINUX24_ENV */
+ dentry = list_entry(tmp, struct dentry, d_lru);
+
+#ifdef AFS_LINUX24_ENV
+ /* Unused dentry with a count? */
+ if (DCOUNT(dentry))
+ BUG();
+#endif
+ DGET(dentry);
+#ifdef AFS_LINUX24_ENV
+ list_del_init(&dentry->d_hash); /* d_drop */
+#else
+ list_del(&dentry->d_hash);
+ INIT_LIST_HEAD(&dentry->d_hash);
+#endif /* AFS_LINUX24_ENV */
+ DUNLOCK();
+ dput(dentry);
+ DLOCK();
+ if (!--found)
+ break;
+ }
+}
+
+/* afs_TryFlushDcacheChildren -- Shakes loose vcache references held by
+ * children of the dentry
+ *
+ * LOCKS -- Called with afs_xvcache write locked. Drops and reaquires
+ * AFS_GLOCK, so it can call dput, which may call iput, but
+ * keeps afs_xvcache exclusively.
+ *
+ * Tree traversal algorithm from fs/dcache.c: select_parent()
+ */
+static void afs_TryFlushDcacheChildren(struct vcache *tvc)
+{
+ struct inode *ip = AFSTOI(tvc);
+ struct dentry *this_parent;
+ struct list_head *next;
+ struct list_head *cur;
+ struct list_head *head = &ip->i_dentry;
+ struct dentry *dentry;
+
+ AFS_GUNLOCK();
+restart:
+#ifndef old_vcache_scheme
+ DLOCK();
+ cur = head;
+ while ((cur = cur->next) != head) {
+ dentry = list_entry(cur, struct dentry, d_alias);
+
+ afs_Trace3(afs_iclSetp, CM_TRACE_TRYFLUSHDCACHECHILDREN,
+ ICL_TYPE_POINTER, ip,
+ ICL_TYPE_STRING, dentry->d_parent->d_name.name,
+ ICL_TYPE_STRING, dentry->d_name.name);
+
+ if (!list_empty(&dentry->d_hash) && !list_empty(&dentry->d_subdirs))
+ __shrink_dcache_parent(dentry);
+
+ if (!DCOUNT(dentry)) {
+ DGET(dentry);
+#ifdef AFS_LINUX24_ENV
+ list_del_init(&dentry->d_hash); /* d_drop */
+#else
+ list_del(&dentry->d_hash);
+ INIT_LIST_HEAD(&dentry->d_hash);
+#endif /* AFS_LINUX24_ENV */
+ DUNLOCK();
+ dput(dentry);
+ goto restart;
+ }
+ }
+ DUNLOCK();
+ AFS_GLOCK();
+#else
+restart:
+ DLOCK();
+ cur = head;
+ while ((cur = cur->next) != head) {
+ dentry = list_entry(cur, struct dentry, d_alias);
+
+ afs_Trace3(afs_iclSetp, CM_TRACE_TRYFLUSHDCACHECHILDREN,
+ ICL_TYPE_POINTER, ip,
+ ICL_TYPE_STRING, dentry->d_parent->d_name.name,
+ ICL_TYPE_STRING, dentry->d_name.name);
+
+ if (!DCOUNT(dentry)) {
+ AFS_GUNLOCK();
+ DGET(dentry);
+ DUNLOCK();
+ d_drop(dentry);
+ dput(dentry);
+ AFS_GLOCK();
+ goto restart;
+ }
+ }
+ DUNLOCK();
+#endif
+}
+#endif /* AFS_LINUX22_ENV */
/*
* afs_NewVCache
* afid : The file id of the file whose cache entry is being
* created.
*/
-/* LOCK: afs_NewVCache afs_xvcache W */
-struct vcache *afs_NewVCache(struct VenusFid *afid, struct server *serverp,
- afs_int32 lockit, afs_int32 locktype)
+/* LOCK: afs_NewVCache afs_xvcache W */
+struct vcache *afs_NewVCache(struct VenusFid *afid, struct server *serverp)
{
struct vcache *tvc;
afs_int32 i;
int code, fv_slept;
AFS_STATCNT(afs_NewVCache);
-#ifdef AFS_LINUX22_ENV
- if (!freeVCList) {
- /* Free some if possible. */
- struct afs_q *tq, *uq;
- int i; char *panicstr;
- int vmax = 2 * afs_cacheStats;
- int vn = VCACHE_FREE;
-
- AFS_GUNLOCK();
- shrink_dcache_sb(afs_globalVFS);
- AFS_GLOCK();
-
- i = 0;
- for(tq = VLRU.prev; tq != &VLRU && vn > 0; tq = uq) {
- tvc = QTOV(tq);
- uq = QPrev(tq);
- if (tvc->states & CVFlushed)
- refpanic ("CVFlushed on VLRU");
- else if (i++ > vmax)
- refpanic ("Exceeded pool of AFS vnodes(VLRU cycle?)");
- else if (QNext(uq) != tq)
- refpanic ("VLRU inconsistent");
-
- if (tvc == afs_globalVp)
- continue;
-
- if ( VREFCOUNT(tvc) && tvc->opens == 0 ) {
- struct inode *ip = (struct inode*)tvc;
- if (list_empty(&ip->i_dentry)) {
- vn --;
- }
- else {
- struct list_head *cur;
- struct list_head *head = &ip->i_dentry;
- int all = 1;
- restart:
-#if defined(AFS_LINUX24_ENV)
- spin_lock(&dcache_lock);
-#endif
- cur = head;
- while ((cur = cur->next) != head) {
- struct dentry *dentry = list_entry(cur, struct dentry, d_alias);
-#if defined(AFS_LINUX24_ENV)
- if (!atomic_read(&dentry->d_count)) {
-#else
- if (!dentry->d_count) {
-#endif
- AFS_GUNLOCK();
-#if defined(AFS_LINUX24_ENV)
- dget_locked(dentry);
- spin_unlock(&dcache_lock);
-#else
- dget(dentry);
-#endif
- d_drop(dentry);
- dput(dentry);
- AFS_GLOCK();
- goto restart;
- }
- else {
- all = 0;
- }
- }
-#if defined(AFS_LINUX24_ENV)
- spin_unlock(&dcache_lock);
-#endif
- if (all) vn --;
- }
- }
- if (tq == uq) break;
- }
- }
-#endif /* AFS_LINUX22_ENV */
#ifdef AFS_OSF_ENV
#ifdef AFS_OSF30_ENV
- if (afs_vcount >= afs_maxvcount)
+ 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,
+ * 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 ))
+ if ( (( 3 * afs_vcount ) > nvnode) || ( afs_vcount >= afs_maxvcount )) {
#endif
- {
- struct afs_q *tq, *uq;
- int i; char *panicstr;
+ struct afs_q *tq, *uq;
+ int i; char *panicstr;
- i = 0;
- for(tq = VLRU.prev; tq != &VLRU && anumber > 0; tq = uq) {
+ i = 0;
+ for (tq = VLRU.prev; tq != &VLRU && anumber > 0; tq = uq) {
tvc = QTOV(tq);
uq = QPrev(tq);
- if (tvc->states & CVFlushed)
- refpanic ("CVFlushed on VLRU");
+ if (tvc->states & CVFlushed)
+ refpanic ("CVFlushed on VLRU");
else if (i++ > afs_maxvcount)
- refpanic ("Exceeded pool of AFS vnodes(VLRU cycle?)");
+ refpanic ("Exceeded pool of AFS vnodes(VLRU cycle?)");
else if (QNext(uq) != tq)
- refpanic ("VLRU inconsistent");
- else if (VREFCOUNT(tvc) < 1)
- refpanic ("refcnt 0 on VLRU");
+ refpanic ("VLRU inconsistent");
+ else if (VREFCOUNT(tvc) < 1)
+ refpanic ("refcnt 0 on VLRU");
- if ( VREFCOUNT(tvc) == 1 && tvc->opens == 0
+ if ( VREFCOUNT(tvc) == 1 && tvc->opens == 0
&& (tvc->states & CUnlinkedDel) == 0) {
code = afs_FlushVCache(tvc, &fv_slept);
if (code == 0) {
- anumber--;
+ anumber--;
}
if (fv_slept) {
- uq = VLRU.prev;
- i = 0;
- continue; /* start over - may have raced. */
+ uq = VLRU.prev;
+ i = 0;
+ continue; /* start over - may have raced. */
}
}
if (tq == uq) break;
- }
- if (anumber == VCACHE_FREE) {
- printf("NewVCache: warning none freed, using %d of %d\n",
+ }
+ if (anumber == VCACHE_FREE) {
+ printf("NewVCache: warning none freed, using %d of %d\n",
afs_vcount, afs_maxvcount);
if (afs_vcount >= afs_maxvcount) {
osi_Panic("NewVCache - none freed");
- /* XXX instead of panicing, should do afs_maxvcount++
+ /* XXX instead of panicing, should do afs_maxvcount++
and magic up another one */
}
- }
- }
+ }
+ }
AFS_GUNLOCK();
if (getnewvnode(MOUNT_AFS, &Afs_vnodeops, &nvc)) {
AFS_GLOCK();
tvc = nvc;
- tvc->nextfree = (struct vcache *)0;
+ tvc->nextfree = NULL;
afs_vcount++;
#else /* AFS_OSF_ENV */
/* pull out a free cache entry */
if (!freeVCList) {
i = 0;
- for(tq = VLRU.prev; (anumber > 0) && (tq != &VLRU); tq = uq) {
- tvc = QTOV(tq);
- uq = QPrev(tq);
+ for (tq = VLRU.prev; (anumber > 0) && (tq != &VLRU); tq = uq) {
+ tvc = QTOV(tq);
+ uq = QPrev(tq);
- if (tvc->states & CVFlushed)
+ if (tvc->states & CVFlushed) {
refpanic("CVFlushed on VLRU");
- else if (i++ > 2*afs_cacheStats) /* even allowing for a few xallocs...*/
+ } 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)
+ } else if (QNext(uq) != tq) {
refpanic("VLRU inconsistent");
+ }
#ifdef AFS_DARWIN_ENV
- if (tvc->opens == 0 && ((tvc->states & CUnlinkedDel) == 0) &&
+ if (tvc->opens == 0 && ((tvc->states & CUnlinkedDel) == 0) &&
VREFCOUNT(tvc) == 1 && UBCINFOEXISTS(&tvc->v)) {
- osi_VM_TryReclaim(tvc, &fv_slept);
- if (fv_slept) {
- uq = VLRU.prev;
- i = 0;
- continue; /* start over - may have raced. */
- }
+ osi_VM_TryReclaim(tvc, &fv_slept);
+ if (fv_slept) {
+ uq = VLRU.prev;
+ i = 0;
+ continue; /* start over - may have raced. */
+ }
}
#endif
- if (VREFCOUNT(tvc) == 0 && tvc->opens == 0
- && (tvc->states & CUnlinkedDel) == 0) {
+#if defined(AFS_FBSD_ENV)
+ if (VREFCOUNT(tvc) == 1 && tvc->opens == 0
+ && (tvc->states & CUnlinkedDel) == 0) {
+ if (!(VOP_LOCK(&tvc->v, LK_EXCLUSIVE, curproc))) {
+ if (VREFCOUNT(tvc) == 1 && tvc->opens == 0
+ && (tvc->states & CUnlinkedDel) == 0) {
+ VREFCOUNT_DEC(tvc);
+ AFS_GUNLOCK(); /* perhaps inline inactive for locking */
+ VOP_INACTIVE(&tvc->v, curproc);
+ AFS_GLOCK();
+ } else {
+ VOP_UNLOCK(&tvc->v, 0, curproc);
+ }
+ }
+ }
+#endif
+#if defined(AFS_LINUX22_ENV)
+ if (tvc != afs_globalVp && VREFCOUNT(tvc) && tvc->opens == 0)
+ afs_TryFlushDcacheChildren(tvc);
+#endif
+
+ if (VREFCOUNT(tvc) == 0 && tvc->opens == 0
+ && (tvc->states & CUnlinkedDel) == 0) {
code = afs_FlushVCache(tvc, &fv_slept);
if (code == 0) {
- anumber--;
+ anumber--;
}
if (fv_slept) {
- uq = VLRU.prev;
- i = 0;
- continue; /* start over - may have raced. */
+ uq = VLRU.prev;
+ i = 0;
+ continue; /* start over - may have raced. */
}
- }
- if (tq == uq ) break;
+ }
+ if (tq == uq ) break;
}
}
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));
-#ifdef AFS_AIX32_ENV
+#ifdef KERNEL_HAVE_PIN
pin((char *)tvc, sizeof(struct vcache)); /* XXX */
#endif
#ifdef AFS_MACH_ENV
else {
tvc = freeVCList; /* take from free list */
freeVCList = tvc->nextfree;
- tvc->nextfree = (struct vcache *)0;
+ tvc->nextfree = NULL;
}
#endif /* AFS_OSF_ENV */
vm_info_ptr = tvc->v.v_vm_info;
#endif /* AFS_MACH_ENV */
+#if defined(AFS_OBSD_ENV)
+ if (tvc->v)
+ panic("afs_NewVCache(): free vcache with vnode attached");
+#endif
+
#if !defined(AFS_SGI_ENV) && !defined(AFS_OSF_ENV)
memset((char *)tvc, 0, sizeof(struct vcache));
#else
tvc->v.v_vm_info = vm_info_ptr;
tvc->v.v_vm_info->pager = MEMORY_OBJECT_NULL;
#endif /* AFS_MACH_ENV */
+#ifdef AFS_OBSD_ENV
+ afs_nbsd_getnewvnode(tvc); /* includes one refcount */
+ lockinit(&tvc->rwlock, PINOD, "vcache", 0, 0);
+#endif
tvc->parentVnode = 0;
- tvc->mvid = (struct VenusFid *) 0;
- tvc->linkData = (char *) 0;
+ tvc->mvid = NULL;
+ tvc->linkData = NULL;
tvc->cbExpires = 0;
tvc->opens = 0;
tvc->execsOrWriters = 0;
hzero(tvc->m.DataVersion); /* in case we copy it into flushDV */
#ifdef AFS_OSF_ENV
/* Hold it for the LRU (should make count 2) */
- VN_HOLD((struct vnode *)tvc);
+ VN_HOLD(AFSTOV(tvc));
#else /* AFS_OSF_ENV */
+#ifndef AFS_OBSD_ENV
VREFCOUNT_SET(tvc, 1); /* us */
+#endif /* AFS_OBSD_ENV */
#endif /* AFS_OSF_ENV */
#ifdef AFS_AIX32_ENV
LOCK_INIT(&tvc->pvmlock, "vcache pvmlock");
#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
+ ** 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
AFS_VN_INIT_BUF_LOCK(&(tvc->v));
#endif
#else
- SetAfsVnode((struct vnode *)tvc);
+ SetAfsVnode(AFSTOV(tvc));
#endif /* AFS_SGI64_ENV */
#ifdef AFS_DARWIN_ENV
tvc->v.v_ubcinfo = UBC_INFO_NULL;
lockinit(&tvc->rwlock, PINOD, "vcache rwlock", 0, 0);
- cache_purge((struct vnode *)tvc);
+ cache_purge(AFSTOV(tvc));
tvc->v.v_data=tvc;
tvc->v.v_tag=VT_AFS;
/* VLISTNONE(&tvc->v); */
tvc->v.v_freelist.tqe_next=0;
tvc->v.v_freelist.tqe_prev=(struct vnode **)0xdeadb;
/*tvc->vrefCount++;*/
-#endif
+#endif
+#ifdef AFS_FBSD_ENV
+ lockinit(&tvc->rwlock, PINOD, "vcache rwlock", 0, 0);
+ cache_purge(AFSTOV(tvc));
+ tvc->v.v_data=tvc;
+ tvc->v.v_tag=VT_AFS;
+ tvc->v.v_usecount++; /* steal an extra ref for now so vfree never happens */
+ /* This extra ref is dealt with above... */
+#endif
/*
* The proper value for mvstat (for root fids) is setup by the caller.
*/
- tvc->mvstat = 0;
+ tvc->mvstat = 0;
if (afid->Fid.Vnode == 1 && afid->Fid.Unique == 1)
- tvc->mvstat = 2;
+ tvc->mvstat = 2;
if (afs_globalVFS == 0) osi_Panic("afs globalvfs");
vSetVfsp(tvc, afs_globalVFS);
vSetType(tvc, VREG);
#endif /* AFS_SGI_ENV */
#if defined(AFS_LINUX22_ENV)
{
- struct inode *ip = (struct inode*)tvc;
+ struct inode *ip = AFSTOI(tvc);
sema_init(&ip->i_sem, 1);
#if defined(AFS_LINUX24_ENV)
sema_init(&ip->i_zombie, 1);
INIT_LIST_HEAD(&ip->i_data.dirty_pages);
INIT_LIST_HEAD(&ip->i_data.locked_pages);
INIT_LIST_HEAD(&ip->i_dirty_buffers);
+#ifdef STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS
+ INIT_LIST_HEAD(&ip->i_dirty_data_buffers);
+#endif
+#ifdef STRUCT_INODE_HAS_I_DEVICES
+ INIT_LIST_HEAD(&ip->i_devices);
+#endif
ip->i_data.host = (void*) ip;
+#ifdef STRUCT_ADDRESS_SPACE_HAS_GFP_MASK
+ ip->i_data.gfp_mask = GFP_HIGHUSER;
+#endif
ip->i_mapping = &ip->i_data;
+#ifdef STRUCT_INODE_HAS_I_TRUNCATE_SEM
+ init_rwsem(&ip->i_truncate_sem);
+#endif
#else
sema_init(&ip->i_atomic_write, 1);
init_waitqueue(&ip->i_wait);
osi_dnlc_purgedp(tvc); /* this may be overkill */
memset((char *)&(tvc->quick), 0, sizeof(struct vtodc));
memset((char *)&(tvc->callsort), 0, sizeof(struct afs_q));
- tvc->slocks = (struct SimpleLocks *)0;
+ tvc->slocks = NULL;
i = VCHash(afid);
tvc->hnext = afs_vhashT[i];
* doflocks : Do we handle flocks?
*/
/* LOCK: afs_FlushActiveVcaches afs_xvcache N */
-void
-afs_FlushActiveVcaches(doflocks)
- register afs_int32 doflocks;
-
-{ /*afs_FlushActiveVcaches*/
-
+void afs_FlushActiveVcaches(register afs_int32 doflocks)
+{
register struct vcache *tvc;
register int i;
register struct conn *tc;
register afs_int32 code;
- register struct AFS_UCRED *cred;
+ register struct AFS_UCRED *cred = NULL;
struct vrequest treq, ureq;
struct AFSVolSync tsync;
int didCore;
tc = afs_Conn(&tvc->fid, &treq, SHARED_LOCK);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_EXTENDLOCK);
-#ifdef RX_ENABLE_LOCKS
- AFS_GUNLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GUNLOCK();
code =
RXAFS_ExtendLock(tc->id,
(struct AFSFid *) &tvc->fid.Fid,
&tsync);
-#ifdef RX_ENABLE_LOCKS
- AFS_GLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GLOCK();
XSTATS_END_TIME;
}
else code = -1;
} while
(afs_Analyze(tc, code, &tvc->fid, &treq,
AFS_STATS_FS_RPCIDX_EXTENDLOCK,
- SHARED_LOCK, (struct cell *)0));
+ SHARED_LOCK, NULL));
ReleaseWriteLock(&tvc->lock);
ObtainReadLock(&afs_xvcache);
* this code. Also, drop the afs_xvcache lock while
* getting vcache locks.
*/
- osi_vnhold(tvc,0);
+ osi_vnhold(tvc, 0);
ReleaseReadLock(&afs_xvcache);
-#if defined(AFS_SUN_ENV) || defined(AFS_ALPHA_ENV)
+#if defined(AFS_SUN_ENV) || defined(AFS_ALPHA_ENV)
afs_BozonLock(&tvc->pvnLock, tvc);
#endif
#if defined(AFS_SGI_ENV)
tvc->states &= ~CCore;
/* XXXX Find better place-holder for cred XXXX */
cred = (struct AFS_UCRED *) tvc->linkData;
- tvc->linkData = (char *) 0; /* XXX */
+ tvc->linkData = NULL; /* XXX */
afs_InitReq(&ureq, cred);
afs_Trace2(afs_iclSetp, CM_TRACE_ACTCCORE,
ICL_TYPE_POINTER, tvc,
ICL_TYPE_INT32, tvc->execsOrWriters);
code = afs_StoreOnLastReference(tvc, &ureq);
ReleaseWriteLock(&tvc->lock);
-#if defined(AFS_SUN_ENV) || defined(AFS_ALPHA_ENV)
+#if defined(AFS_SUN_ENV) || defined(AFS_ALPHA_ENV)
afs_BozonUnlock(&tvc->pvnLock, tvc);
#endif
hzero(tvc->flushDV);
}
} else if (tvc->states & CUnlinkedDel) {
/*
- * Ignore errors
+ * Ignore errors
*/
ReleaseWriteLock(&tvc->lock);
-#if defined(AFS_SUN_ENV) || defined(AFS_ALPHA_ENV)
+#if defined(AFS_SUN_ENV) || defined(AFS_ALPHA_ENV)
afs_BozonUnlock(&tvc->pvnLock, tvc);
#endif
#if defined(AFS_SGI_ENV)
#ifdef AFS_GFS_ENV
VREFCOUNT_DEC(tvc);
#else
- AFS_RELE((struct vnode *)tvc);
+ AFS_RELE(AFSTOV(tvc));
#endif
/* Matches write code setting CCore flag */
crfree(cred);
}
- }
+ }
#ifdef AFS_DARWIN_ENV
if (VREFCOUNT(tvc) == 1 && UBCINFOEXISTS(&tvc->v)) {
if (tvc->opens) panic("flushactive open, hasubc, but refcnt 1");
}
}
ReleaseReadLock(&afs_xvcache);
-
-} /*afs_FlushActiveVcaches*/
+}
/*
*
* Description:
* 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.
*
- * Anymore, the only places that call this KNOW already that the
+ * Anymore, the only places that call this KNOW already that the
* vcache is not up-to-date, so we don't screw around.
*
* Parameters:
return 0;
}
ObtainWriteLock(&afs_xcbhash, 461);
- avc->states &= ~( CStatd | CUnique );
- avc->callback = (struct server *)0;
+ avc->states &= ~( CStatd | CUnique );
+ avc->callback = NULL;
afs_DequeueCallback(avc);
ReleaseWriteLock(&afs_xcbhash);
ReleaseWriteLock(&avc->lock);
- /* since we've been called back, or the callback has expired,
- * it's possible that the contents of this directory, or this
+ /* since we've been called back, or the callback has expired,
+ * 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->states & CForeign) || (avc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (avc);
else
osi_dnlc_purgevp (avc);
-
+
/* fetch the status info */
- tvc = afs_GetVCache(&avc->fid, areq, (afs_int32*)0, avc, READ_LOCK);
+ tvc = afs_GetVCache(&avc->fid, areq, NULL, avc);
if (!tvc) return ENOENT;
/* Put it back; caller has already incremented vrefCount */
- afs_PutVCache(tvc, READ_LOCK);
+ afs_PutVCache(tvc);
return 0;
} /*afs_VerifyVCache*/
*
* Callers: as of 1992-04-29, only called by WriteVCache
*/
-static void
-afs_SimpleVStat(avc, astat, areq)
- register struct vcache *avc;
- register struct AFSFetchStatus *astat;
- struct vrequest *areq;
-{ /*afs_SimpleVStat*/
-
+static void afs_SimpleVStat(register struct vcache *avc,
+ register struct AFSFetchStatus *astat, struct vrequest *areq)
+{
+ afs_size_t length;
AFS_STATCNT(afs_SimpleVStat);
#ifdef AFS_SGI_ENV
#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)
osi_Assert((valusema(&avc->vc_rwlock) <= 0) &&
(OSI_GET_LOCKID() == avc->vc_rwlockid));
- if (astat->Length < avc->m.Length) {
+ if (length < avc->m.Length) {
vnode_t *vp = (vnode_t *)avc;
-
+
osi_Assert(WriteLocked(&avc->lock));
ReleaseWriteLock(&avc->lock);
AFS_GUNLOCK();
- PTOSSVP(vp, (off_t)astat->Length, (off_t)MAXLONG);
+ PTOSSVP(vp, (off_t)length, (off_t)MAXLONG);
AFS_GLOCK();
ObtainWriteLock(&avc->lock,67);
}
/* if writing the file, don't fetch over this value */
afs_Trace3(afs_iclSetp, CM_TRACE_SIMPLEVSTAT,
ICL_TYPE_POINTER, avc,
- ICL_TYPE_INT32, avc->m.Length,
- ICL_TYPE_INT32, astat->Length);
- avc->m.Length = astat->Length;
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->m.Length),
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(length));
+ avc->m.Length = length;
avc->m.Date = astat->ClientModTime;
}
avc->m.Owner = astat->Owner;
struct axscache *ac;
avc->anyAccess = astat->AnonymousAccess;
#ifdef badidea
- if ((astat->CallerAccess & ~astat->AnonymousAccess))
- /* USED TO SAY :
+ if ((astat->CallerAccess & ~astat->AnonymousAccess))
+ /* USED TO SAY :
* Caller has at least one bit not covered by anonymous, and
* thus may have interesting rights.
*
* HOWEVER, this is a really bad idea, because any access query
* for bits which aren't covered by anonymous, on behalf of a user
- * who doesn't have any special rights, will result in an answer of
+ * who doesn't have any special rights, will result in an answer of
* the form "I don't know, lets make a FetchStatus RPC and find out!"
* It's an especially bad idea under Ultrix, since (due to the lack of
- * a proper access() call) it must perform several afs_access() calls
+ * a proper access() call) it must perform several afs_access() calls
* in order to create magic mode bits that vary according to who makes
- * the call. In other words, _every_ stat() generates a test for
+ * the call. In other words, _every_ stat() generates a test for
* writeability...
*/
#endif /* badidea */
if (avc->Access && (ac = afs_FindAxs(avc->Access, areq->uid)))
- ac->axess = astat->CallerAccess;
+ ac->axess = astat->CallerAccess;
else /* not found, add a new one if possible */
afs_AddAxs(avc->Access, areq->uid, astat->CallerAccess);
}
* Must be called with a shared lock held on the vnode.
*/
-afs_WriteVCache(avc, astatus, areq)
- register struct vcache *avc;
- register struct AFSStoreStatus *astatus;
- struct vrequest *areq;
-
-{ /*afs_WriteVCache*/
+int afs_WriteVCache(register struct vcache *avc,
+ register struct AFSStoreStatus *astatus, struct vrequest *areq)
+{
afs_int32 code;
struct conn *tc;
struct AFSFetchStatus OutStatus;
AFS_STATCNT(afs_WriteVCache);
afs_Trace2(afs_iclSetp, CM_TRACE_WVCACHE, ICL_TYPE_POINTER, avc,
- ICL_TYPE_INT32, avc->m.Length);
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->m.Length));
do {
tc = afs_Conn(&avc->fid, areq, SHARED_LOCK);
if (tc) {
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_STORESTATUS);
-#ifdef RX_ENABLE_LOCKS
- AFS_GUNLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GUNLOCK();
code = RXAFS_StoreStatus(tc->id,
(struct AFSFid *) &avc->fid.Fid,
astatus, &OutStatus, &tsync);
-#ifdef RX_ENABLE_LOCKS
- AFS_GLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GLOCK();
XSTATS_END_TIME;
}
else code = -1;
} while
(afs_Analyze(tc, code, &avc->fid, areq,
AFS_STATS_FS_RPCIDX_STORESTATUS,
- SHARED_LOCK, (struct cell *)0));
+ SHARED_LOCK, NULL));
UpgradeSToWLock(&avc->lock,20);
if (code == 0) {
afs_DequeueCallback(avc);
avc->states &= ~( CStatd | CUnique); /* turn off stat valid flag */
ReleaseWriteLock(&afs_xcbhash);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (avc); /* if it (could be) a directory */
}
ConvertWToSLock(&avc->lock);
* been modified. This is less than ideal. I haven't thought about
* it sufficiently to be certain that it is adequate.
*/
-void
-afs_ProcessFS(avc, astat, areq)
- register struct vcache *avc;
- struct vrequest *areq;
- register struct AFSFetchStatus *astat;
-
-{ /*afs_ProcessFS*/
-
- register int i;
+void afs_ProcessFS(register struct vcache *avc, register struct AFSFetchStatus *astat,
+ struct vrequest *areq)
+{
+ afs_size_t length;
AFS_STATCNT(afs_ProcessFS);
+#ifdef AFS_64BIT_CLIENT
+ FillInt64(length, astat->Length_hi, astat->Length);
+#else /* AFS_64BIT_CLIENT */
+ length = astat->Length;
+#endif /* AFS_64BIT_CLIENT */
/* WARNING: afs_DoBulkStat uses the Length field to store a sequence
* number for each bulk status request. Under no circumstances
* should afs_DoBulkStat store a sequence number if the new
* values.
*/
afs_Trace3(afs_iclSetp, CM_TRACE_PROCESSFS, ICL_TYPE_POINTER, avc,
- ICL_TYPE_INT32, avc->m.Length,
- ICL_TYPE_INT32, astat->Length);
- avc->m.Length = astat->Length;
+ ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(avc->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.Mode |= S_IFDIR;
}
else if (astat->FileType == SymbolicLink) {
- vSetType(avc, VLNK);
- avc->m.Mode |= S_IFLNK;
- if ((avc->m.Mode & 0111) == 0) avc->mvstat = 1;
+ if (afs_fakestat_enable && (avc->m.Mode & 0111) == 0) {
+ vSetType(avc, VDIR);
+ avc->m.Mode |= S_IFDIR;
+ } else {
+ vSetType(avc, VLNK);
+ avc->m.Mode |= S_IFLNK;
+ }
+ if ((avc->m.Mode & 0111) == 0) {
+ avc->mvstat = 1;
+ }
}
avc->anyAccess = astat->AnonymousAccess;
#ifdef badidea
- if ((astat->CallerAccess & ~astat->AnonymousAccess))
- /* USED TO SAY :
+ if ((astat->CallerAccess & ~astat->AnonymousAccess))
+ /* USED TO SAY :
* Caller has at least one bit not covered by anonymous, and
* thus may have interesting rights.
*
* HOWEVER, this is a really bad idea, because any access query
* for bits which aren't covered by anonymous, on behalf of a user
- * who doesn't have any special rights, will result in an answer of
+ * who doesn't have any special rights, will result in an answer of
* the form "I don't know, lets make a FetchStatus RPC and find out!"
* It's an especially bad idea under Ultrix, since (due to the lack of
- * a proper access() call) it must perform several afs_access() calls
+ * a proper access() call) it must perform several afs_access() calls
* in order to create magic mode bits that vary according to who makes
- * the call. In other words, _every_ stat() generates a test for
+ * the call. In other words, _every_ stat() generates a test for
* writeability...
*/
#endif /* badidea */
{
struct axscache *ac;
if (avc->Access && (ac = afs_FindAxs(avc->Access, areq->uid)))
- ac->axess = astat->CallerAccess;
+ ac->axess = astat->CallerAccess;
else /* not found, add a new one if possible */
afs_AddAxs(avc->Access, areq->uid, astat->CallerAccess);
}
#ifdef AFS_LINUX22_ENV
vcache2inode(avc); /* Set the inode attr cache */
#endif
+#ifdef AFS_DARWIN_ENV
+ osi_VM_Setup(avc,1);
+#endif
} /*afs_ProcessFS*/
-afs_RemoteLookup(afid, areq, name, nfid, OutStatusp, CallBackp, serverp, tsyncp)
- register struct VenusFid *afid;
- struct vrequest *areq;
- char *name;
- struct VenusFid *nfid;
- struct AFSFetchStatus *OutStatusp;
- struct AFSCallBack *CallBackp;
- struct server **serverp;
- struct AFSVolSync *tsyncp;
+int afs_RemoteLookup(register struct VenusFid *afid, struct vrequest *areq,
+ char *name, struct VenusFid *nfid, struct AFSFetchStatus *OutStatusp,
+ struct AFSCallBack *CallBackp, struct server **serverp, struct AFSVolSync *tsyncp)
{
- afs_int32 code, i;
- register struct vcache *tvc;
- struct volume *tvp;
+ afs_int32 code;
afs_uint32 start;
register struct conn *tc;
struct AFSFetchStatus OutDirStatus;
if (serverp) *serverp = tc->srvr->server;
start = osi_Time();
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_XLOOKUP);
-#ifdef RX_ENABLE_LOCKS
- AFS_GUNLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GUNLOCK();
code = RXAFS_Lookup(tc->id, (struct AFSFid *) &afid->Fid, name,
- (struct AFSFid *) &nfid->Fid,
+ (struct AFSFid *) &nfid->Fid,
OutStatusp, &OutDirStatus, CallBackp, tsyncp);
-#ifdef RX_ENABLE_LOCKS
- AFS_GLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GLOCK();
XSTATS_END_TIME;
- } else
+ } else
code = -1;
} while
(afs_Analyze(tc, code, afid, areq,
AFS_STATS_FS_RPCIDX_XLOOKUP,
- SHARED_LOCK, (struct cell *)0));
+ SHARED_LOCK, NULL));
return code;
}
* afid : File ID.
* areq : Ptr to associated vrequest structure, specifying the
* user whose authentication tokens will be used.
- * avc : caller may already have a vcache for this file, which is
+ * avc : caller may already have a vcache for this file, which is
* already held.
*
* Environment:
*
* 1. Lock all files first, then directories.
* 2. Within a particular type, lock entries in Fid.Vnode order.
- *
+ *
* This locking hierarchy is convenient because it allows locking
* 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.
* NB. NewVCache -> FlushVCache presently (4/10/95) drops the xvcache lock.
*/
-struct vcache *afs_GetVCache(afid, areq, cached, avc, locktype)
- register struct VenusFid *afid;
- struct vrequest *areq;
- afs_int32 *cached;
- afs_int32 locktype;
- struct vcache *avc; /* might have a vcache structure already, which must
+ /* might have a vcache structure already, which must
* already be held by the caller */
-{ /*afs_GetVCache*/
- afs_int32 code, i, newvcache=0;
+struct vcache *afs_GetVCache(register struct VenusFid *afid, struct vrequest *areq,
+ afs_int32 *cached, struct vcache *avc)
+{
+
+ afs_int32 code, newvcache=0;
register struct vcache *tvc;
struct volume *tvp;
afs_int32 retry;
if (cached) *cached = 0; /* Init just in case */
+#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
loop:
- ObtainSharedLock(&afs_xvcache,5);
+#endif
- tvc = afs_FindVCache(afid, 0, 0, &retry, DO_STATS | DO_VLRU );
+ ObtainSharedLock(&afs_xvcache,5);
+
+ tvc = afs_FindVCache(afid, &retry, DO_STATS | DO_VLRU );
if (tvc && retry) {
#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
ReleaseSharedLock(&afs_xvcache);
goto loop;
#endif
}
-
+
if (tvc) {
- if (cached)
+ if (cached)
*cached = 1;
- if (tvc->states & CStatd) {
+ if (tvc->states & CStatd) {
ReleaseSharedLock(&afs_xvcache);
return tvc;
}
}
- else {
+ else {
UpgradeSToWLock(&afs_xvcache,21);
/* no cache entry, better grab one */
- tvc = afs_NewVCache(afid, (struct server *)0, 1, WRITE_LOCK);
+ tvc = afs_NewVCache(afid, NULL);
newvcache = 1;
ConvertWToSLock(&afs_xvcache);
#endif
ReleaseWriteLock(&tvc->lock);
#ifdef AFS_DARWIN_ENV
- osi_VM_Setup(tvc);
+ osi_VM_Setup(tvc,0);
#endif
return tvc;
}
#endif /* AFS_OSF_ENV */
ObtainWriteLock(&afs_xcbhash, 464);
- tvc->states &= ~CUnique;
+ tvc->states &= ~CUnique;
tvc->callback = 0;
afs_DequeueCallback(tvc);
ReleaseWriteLock(&afs_xcbhash);
if (tvp) {
if ((tvp->states & VForeign)) {
if (newvcache) tvc->states |= CForeign;
- if (newvcache && (tvp->rootVnode == afid->Fid.Vnode)
+ if (newvcache && (tvp->rootVnode == afid->Fid.Vnode)
&& (tvp->rootUnique == afid->Fid.Unique)) {
tvc->mvstat = 2;
}
ObtainReadLock(&afs_xvcache);
AFS_FAST_RELE(tvc);
ReleaseReadLock(&afs_xvcache);
- return (struct vcache *) 0;
+ return NULL;
}
ReleaseWriteLock(&tvc->lock);
-#ifdef AFS_DARWIN_ENV
- osi_VM_Setup(avc);
-#endif
return tvc;
} /*afs_GetVCache*/
struct vcache *afs_LookupVCache(struct VenusFid *afid, struct vrequest *areq,
- afs_int32 *cached, afs_int32 locktype,
- struct vcache *adp, char *aname)
+ afs_int32 *cached, struct vcache *adp, char *aname)
{
- afs_int32 code, now, newvcache=0, hash;
+ afs_int32 code, now, newvcache=0;
struct VenusFid nfid;
register struct vcache *tvc;
struct volume *tvp;
AFS_STATCNT(afs_GetVCache);
if (cached) *cached = 0; /* Init just in case */
+#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
loop1:
+#endif
+
ObtainReadLock(&afs_xvcache);
- tvc = afs_FindVCache(afid, 0, 0, &retry, DO_STATS /* no vlru */);
+ tvc = afs_FindVCache(afid, &retry, DO_STATS /* no vlru */);
if (tvc) {
ReleaseReadLock(&afs_xvcache);
}
ReleaseReadLock(&tvc->lock);
return tvc;
- }
- tvc->states &= ~CUnique;
+ }
+ tvc->states &= ~CUnique;
ReleaseReadLock(&tvc->lock);
ObtainReadLock(&afs_xvcache);
now = osi_Time();
origCBs = afs_allCBs; /* if anything changes, we don't have a cb */
code = afs_RemoteLookup(&adp->fid, areq, aname, &nfid, &OutStatus, &CallBack,
- &serverp, &tsync);
+ &serverp, &tsync);
+#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
loop2:
+#endif
+
ObtainSharedLock(&afs_xvcache,6);
- tvc = afs_FindVCache(&nfid, 0, 0, &retry, DO_VLRU /* no xstats now*/);
+ tvc = afs_FindVCache(&nfid, &retry, DO_VLRU /* no xstats now*/);
if (tvc && retry) {
#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
ReleaseSharedLock(&afs_xvcache);
if (!tvc) {
/* no cache entry, better grab one */
UpgradeSToWLock(&afs_xvcache,22);
- tvc = afs_NewVCache(&nfid, (struct server *)0, 1, WRITE_LOCK);
+ tvc = afs_NewVCache(&nfid, NULL);
newvcache = 1;
ConvertWToSLock(&afs_xvcache);
}
ReleaseSharedLock(&afs_xvcache);
ObtainWriteLock(&tvc->lock,55);
-
+
/* It is always appropriate to throw away all the access rights? */
afs_FreeAllAxs(&(tvc->Access));
tvp = afs_GetVolume(afid, areq, READ_LOCK); /* copy useful per-vol info */
afs_DequeueCallback(tvc);
tvc->states &= ~( CStatd | CUnique );
ReleaseWriteLock(&afs_xcbhash);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (tvc); /* if it (could be) a directory */
if ( tvp )
afs_PutVolume(tvp, READ_LOCK);
ObtainReadLock(&afs_xvcache);
AFS_FAST_RELE(tvc);
ReleaseReadLock(&afs_xvcache);
- return (struct vcache *) 0;
+ return NULL;
}
ObtainWriteLock(&afs_xcbhash, 466);
tvc->cbExpires = 3600+osi_Time(); /*XXX*/
tvc->states |= CStatd | CUnique;
tvc->states &= ~CBulkFetching;
- afs_QueueCallback(tvc, CBHash(3600), tvp);
+ afs_QueueCallback(tvc, CBHash(3600), tvp);
} else {
- tvc->callback = (struct server *)0;
+ tvc->callback = NULL;
afs_DequeueCallback(tvc);
- tvc->states &= ~(CStatd | CUnique);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ tvc->states &= ~(CStatd | CUnique);
+ if ((tvc->states & CForeign) || (tvc->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->callback = (struct server *)0;
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ tvc->states &= ~CStatd;
+ tvc->states &= ~CUnique;
+ tvc->callback = NULL;
+ if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (tvc); /* if it (could be) a directory */
- }
+ }
ReleaseWriteLock(&afs_xcbhash);
if ( tvp )
afs_PutVolume(tvp, READ_LOCK);
afs_ProcessFS(tvc, &OutStatus, areq);
ReleaseWriteLock(&tvc->lock);
-#ifdef AFS_DARWIN_ENV
- osi_VM_Setup(tvc);
-#endif
return tvc;
}
struct vcache *afs_GetRootVCache(struct VenusFid *afid,
struct vrequest *areq, afs_int32 *cached,
- struct volume *tvolp, afs_int32 locktype)
+ struct volume *tvolp)
{
- afs_int32 code, i, newvcache = 0, haveStatus = 0;
+ afs_int32 code = 0, i, newvcache = 0, haveStatus = 0;
afs_int32 getNewFid = 0;
afs_uint32 start;
struct VenusFid nfid;
struct AFSFetchStatus OutStatus;
struct AFSCallBack CallBack;
struct AFSVolSync tsync;
- int origCBs;
+ int origCBs = 0;
start = osi_Time();
tfid = *afid;
tfid.Fid.Vnode = 0; /* Means get rootfid of volume */
origCBs = afs_allCBs; /* ignore InitCallBackState */
- code = afs_RemoteLookup(&tfid, areq, (char *)0, &nfid,
+ code = afs_RemoteLookup(&tfid, areq, NULL, &nfid,
&OutStatus, &CallBack, &serverp, &tsync);
if (code) {
- return (struct vcache *)0;
+ return NULL;
}
/* ReleaseReadLock(&tvolp->lock); */
ObtainWriteLock(&tvolp->lock,56);
tvolp->rootVnode = afid->Fid.Vnode = nfid.Fid.Vnode;
tvolp->rootUnique = afid->Fid.Unique = nfid.Fid.Unique;
- ReleaseWriteLock(&tvolp->lock);
+ ReleaseWriteLock(&tvolp->lock);
/* ObtainReadLock(&tvolp->lock);*/
haveStatus = 1;
} else {
afid->Fid.Vnode = tvolp->rootVnode;
afid->Fid.Unique = tvolp->rootUnique;
- }
-
+ }
+
ObtainSharedLock(&afs_xvcache,7);
i = VCHash(afid);
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
if (!FidCmp(&(tvc->fid), afid)) {
#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
+ /* 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 */
int vg;
AFS_GUNLOCK();
- vg = vget((struct vnode *)tvc); /* this bumps ref count */
+ vg = vget(AFSTOV(tvc)); /* this bumps ref count */
AFS_GLOCK();
if (vg)
continue;
if (!tvc) {
UpgradeSToWLock(&afs_xvcache,23);
/* no cache entry, better grab one */
- tvc = afs_NewVCache(afid, (struct server *)0, 1, WRITE_LOCK);
+ tvc = afs_NewVCache(afid, NULL);
newvcache = 1;
afs_stats_cmperf.vcacheMisses++;
}
#ifdef AFS_OSF_ENV
/* we already bumped the ref count in the for loop above */
#else /* AFS_OSF_ENV */
- osi_vnhold(tvc,0);
+ osi_vnhold(tvc, 0);
#endif
UpgradeSToWLock(&afs_xvcache,24);
if ((VLRU.next->prev != &VLRU) || (VLRU.prev->next != &VLRU)) {
if (tvc->states & CStatd) {
return tvc;
- } else {
+ } else {
ObtainReadLock(&tvc->lock);
- tvc->states &= ~CUnique;
- tvc->callback = (struct server *)0; /* redundant, perhaps */
+ tvc->states &= ~CUnique;
+ tvc->callback = NULL; /* redundant, perhaps */
ReleaseReadLock(&tvc->lock);
}
if (tvolp->states & VRO) tvc->states |= CRO;
if (tvolp->states & VBackup) tvc->states |= CBackup;
/* now copy ".." entry back out of volume structure, if necessary */
- if (newvcache && (tvolp->rootVnode == afid->Fid.Vnode)
+ if (newvcache && (tvolp->rootVnode == afid->Fid.Vnode)
&& (tvolp->rootUnique == afid->Fid.Unique)) {
tvc->mvstat = 2;
}
tfid = *afid;
tfid.Fid.Vnode = 0; /* Means get rootfid of volume */
origCBs = afs_allCBs; /* ignore InitCallBackState */
- code = afs_RemoteLookup(&tfid, areq, (char *)0, &nfid, &OutStatus,
+ code = afs_RemoteLookup(&tfid, areq, NULL, &nfid, &OutStatus,
&CallBack, &serverp, &tsync);
}
if (code) {
ObtainWriteLock(&afs_xcbhash, 467);
afs_DequeueCallback(tvc);
- tvc->callback = (struct server *)0;
- tvc->states &= ~(CStatd|CUnique);
+ tvc->callback = NULL;
+ tvc->states &= ~(CStatd|CUnique);
ReleaseWriteLock(&afs_xcbhash);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (tvc); /* if it (could be) a directory */
ReleaseWriteLock(&tvc->lock);
ObtainReadLock(&afs_xvcache);
AFS_FAST_RELE(tvc);
ReleaseReadLock(&afs_xvcache);
- return (struct vcache *) 0;
+ return NULL;
}
-
+
ObtainWriteLock(&afs_xcbhash, 468);
if (origCBs == afs_allCBs) {
tvc->states |= CTruth;
tvc->callback = serverp;
- if (CallBack.ExpirationTime != 0) {
+ if (CallBack.ExpirationTime != 0) {
tvc->cbExpires = CallBack.ExpirationTime+start;
tvc->states |= CStatd;
tvc->states &= ~CBulkFetching;
}
} else {
afs_DequeueCallback(tvc);
- tvc->callback = (struct server *)0;
+ tvc->callback = NULL;
tvc->states &= ~(CStatd | CUnique);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (tvc); /* if it (could be) a directory */
}
ReleaseWriteLock(&afs_xcbhash);
afs_ProcessFS(tvc, &OutStatus, areq);
-
+
ReleaseWriteLock(&tvc->lock);
return tvc;
}
/*
- * must be called with avc write-locked
- * don't absolutely have to invalidate the hint unless the dv has
+ * must be called with avc write-locked
+ * don't absolutely have to invalidate the hint unless the dv has
* changed, but be sure to get it right else there will be consistency bugs.
*/
afs_int32 afs_FetchStatus(struct vcache *avc, struct VenusFid *afid,
struct vrequest *areq, struct AFSFetchStatus *Outsp)
{
int code;
- afs_uint32 start;
+ afs_uint32 start = 0;
register struct conn *tc;
struct AFSCallBack CallBack;
struct AFSVolSync tsync;
avc->callback = tc->srvr->server;
start = osi_Time();
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_FETCHSTATUS);
-#ifdef RX_ENABLE_LOCKS
- AFS_GUNLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GUNLOCK();
code = RXAFS_FetchStatus(tc->id,
(struct AFSFid *) &afid->Fid,
Outsp, &CallBack, &tsync);
-#ifdef RX_ENABLE_LOCKS
- AFS_GLOCK();
-#endif /* RX_ENABLE_LOCKS */
+ RX_AFS_GLOCK();
XSTATS_END_TIME;
} while
(afs_Analyze(tc, code, afid, areq,
AFS_STATS_FS_RPCIDX_FETCHSTATUS,
- SHARED_LOCK, (struct cell *)0));
+ SHARED_LOCK, NULL));
if (!code) {
afs_ProcessFS(avc, Outsp, areq);
ObtainWriteLock(&afs_xcbhash, 469);
avc->states |= CTruth;
if (avc->callback /* check for race */) {
- if (CallBack.ExpirationTime != 0) {
+ if (CallBack.ExpirationTime != 0) {
avc->cbExpires = CallBack.ExpirationTime+start;
avc->states |= CStatd;
avc->states &= ~CBulkFetching;
afs_QueueCallback(avc, CBHash(CallBack.ExpirationTime), volp);
}
- else if (avc->states & CRO)
+ else if (avc->states & CRO)
{ /* ordinary callback on a read-only volume -- AFS 3.2 style */
avc->cbExpires = 3600+start;
avc->states |= CStatd;
}
else {
afs_DequeueCallback(avc);
- avc->callback = (struct server *)0;
- avc->states &= ~(CStatd|CUnique);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ avc->callback = NULL;
+ avc->states &= ~(CStatd|CUnique);
+ if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (avc); /* if it (could be) a directory */
}
}
else {
afs_DequeueCallback(avc);
- avc->callback = (struct server *)0;
- avc->states &= ~(CStatd|CUnique);
- if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
+ avc->callback = NULL;
+ avc->states &= ~(CStatd|CUnique);
+ if ((avc->states & CForeign) || (avc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (avc); /* if it (could be) a directory */
}
ReleaseWriteLock(&afs_xcbhash);
if ( volp )
afs_PutVolume(volp, READ_LOCK);
}
-else { /* used to undo the local callback, but that's too extreme.
- * There are plenty of good reasons that fetchstatus might return
- * an error, such as EPERM. If we have the vnode cached, statd,
- * with callback, might as well keep track of the fact that we
+else { /* used to undo the local callback, but that's too extreme.
+ * There are plenty of good reasons that fetchstatus might return
+ * an error, such as EPERM. If we have the vnode cached, statd,
+ * with callback, might as well keep track of the fact that we
* don't have access...
*/
if (code == EPERM || code == EACCES) {
* Environment:
* Nothing interesting.
*/
-void
-afs_StuffVcache(afid, OutStatus, CallBack, tc, areq)
- register struct VenusFid *afid;
- struct AFSFetchStatus *OutStatus;
- struct AFSCallBack *CallBack;
- register struct conn *tc;
- struct vrequest *areq;
-
-{ /*afs_StuffVcache*/
-
+void afs_StuffVcache(register struct VenusFid *afid,
+ struct AFSFetchStatus *OutStatus, struct AFSCallBack *CallBack,
+ register struct conn *tc, struct vrequest *areq)
+{
register afs_int32 code, i, newvcache=0;
register struct vcache *tvc;
struct AFSVolSync tsync;
loop:
ObtainSharedLock(&afs_xvcache,8);
- tvc = afs_FindVCache(afid, 0, 0, &retry, DO_VLRU /* no stats */);
+ tvc = afs_FindVCache(afid, &retry, DO_VLRU /* no stats */);
if (tvc && retry) {
#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
ReleaseSharedLock(&afs_xvcache);
if (!tvc) {
/* no cache entry, better grab one */
UpgradeSToWLock(&afs_xvcache,25);
- tvc = afs_NewVCache(afid, (struct server *)0, 1, WRITE_LOCK);
+ tvc = afs_NewVCache(afid, NULL);
newvcache = 1;
ConvertWToSLock(&afs_xvcache);
}
ObtainWriteLock(&tvc->lock,58);
tvc->states &= ~CStatd;
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ if ((tvc->states & CForeign) || (tvc->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? */
afs_ProcessFS(tvc, OutStatus, areq);
tvc->callback = tc->srvr->server;
- /* we use osi_Time twice below. Ideally, we would use the time at which
+ /* we use osi_Time twice below. Ideally, we would use the time at which
* the FetchStatus call began, instead, but we don't have it here. So we
- * make do with "now". In the CRO case, it doesn't really matter. In
- * the other case, we hope that the difference between "now" and when the
+ * make do with "now". In the CRO case, it doesn't really matter. In
+ * the other case, we hope that the difference between "now" and when the
* call actually began execution on the server won't be larger than the
- * padding which the server keeps. Subtract 1 second anyway, to be on
+ * padding which the server keeps. Subtract 1 second anyway, to be on
* the safe side. Can't subtract more because we don't know how big
* ExpirationTime is. Possible consistency problems may arise if the call
* timeout period becomes longer than the server's expiration padding. */
ObtainWriteLock(&afs_xcbhash, 470);
if (CallBack->ExpirationTime != 0) {
- tvc->cbExpires = CallBack->ExpirationTime+osi_Time()-1;
+ tvc->cbExpires = CallBack->ExpirationTime+osi_Time()-1;
tvc->states |= CStatd;
tvc->states &= ~CBulkFetching;
afs_QueueCallback(tvc, CBHash(CallBack->ExpirationTime), tvp);
tvc->cbExpires = 3600+osi_Time(); /*XXX*/
tvc->states |= CStatd;
tvc->states &= ~CBulkFetching;
- afs_QueueCallback(tvc, CBHash(3600), tvp);
+ afs_QueueCallback(tvc, CBHash(3600), tvp);
}
else {
afs_DequeueCallback(tvc);
- tvc->callback = (struct server *)0;
- tvc->states &= ~(CStatd|CUnique);
- if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
+ tvc->callback = NULL;
+ tvc->states &= ~(CStatd|CUnique);
+ if ((tvc->states & CForeign) || (tvc->fid.Fid.Vnode & 1))
osi_dnlc_purgedp (tvc); /* if it (could be) a directory */
}
ReleaseWriteLock(&afs_xcbhash);
if ( tvp )
afs_PutVolume(tvp, READ_LOCK);
-
+
/* look in per-pag cache */
if (tvc->Access && (ac = afs_FindAxs(tvc->Access, areq->uid)))
ac->axess = OutStatus->CallerAccess; /* substitute pags */
/*
* Release ref count... hope this guy stays around...
*/
- afs_PutVCache(tvc, WRITE_LOCK);
+ afs_PutVCache(tvc);
} /*afs_StuffVcache*/
#endif
* Environment:
* Nothing interesting.
*/
-void
-afs_PutVCache(avc, locktype)
- register struct vcache *avc;
- afs_int32 locktype;
-{ /*afs_PutVCache*/
-
+void afs_PutVCache(register struct vcache *avc)
+{
AFS_STATCNT(afs_PutVCache);
/*
* Can we use a read lock here?
*
* Parameters:
* afid : Pointer to the fid whose cache entry we desire.
- * retry: (SGI-specific) tell the caller to drop the lock on xvcache,
+ * retry: (SGI-specific) tell the caller to drop the lock on xvcache,
* unlock the vnode, and try again.
* flags: bit 1 to specify whether to compute hit statistics. Not
* set if FindVCache is called as part of internal bookkeeping.
* must be shared-- we upgrade it here.
*/
-struct vcache *afs_FindVCache(struct VenusFid *afid, afs_int32 lockit,
- afs_int32 locktype, afs_int32 *retry, afs_int32 flag)
+struct vcache *afs_FindVCache(struct VenusFid *afid, afs_int32 *retry, afs_int32 flag)
{
register struct vcache *tvc;
/* Grab this vnode, possibly reactivating from the free list */
int vg;
AFS_GUNLOCK();
- vg = vget((struct vnode *)tvc);
+ vg = vget(AFSTOV(tvc));
AFS_GLOCK();
if (vg)
continue;
-#endif /* AFS_OSF_ENV */
+#endif /* AFS_OSF_ENV */
break;
}
}
if (tvc) {
if (retry) *retry = 0;
#if !defined(AFS_OSF_ENV)
- osi_vnhold(tvc, retry); /* already held, above */
- if (retry && *retry)
- return 0;
+ osi_vnhold(tvc, retry); /* already held, above */
+ if (retry && *retry)
+ return 0;
#endif
/*
* only move to front of vlru if we have proper vcache locking)
*/
if (flag & DO_VLRU) {
- if ((VLRU.next->prev != &VLRU) || (VLRU.prev->next != &VLRU)) {
- refpanic ("FindVC VLRU inconsistent1");
- }
- if (tvc->vlruq.next->prev != &(tvc->vlruq)) {
- refpanic ("FindVC VLRU inconsistent1");
- }
- if (tvc->vlruq.prev->next != &(tvc->vlruq)) {
- refpanic ("FindVC VLRU inconsistent2");
- }
+ if ((VLRU.next->prev != &VLRU) || (VLRU.prev->next != &VLRU)) {
+ refpanic ("FindVC VLRU inconsistent1");
+ }
+ if (tvc->vlruq.next->prev != &(tvc->vlruq)) {
+ refpanic ("FindVC VLRU inconsistent1");
+ }
+ if (tvc->vlruq.prev->next != &(tvc->vlruq)) {
+ refpanic ("FindVC VLRU inconsistent2");
+ }
UpgradeSToWLock(&afs_xvcache,26);
QRemove(&tvc->vlruq);
QAdd(&VLRU, &tvc->vlruq);
ConvertWToSLock(&afs_xvcache);
- if ((VLRU.next->prev != &VLRU) || (VLRU.prev->next != &VLRU)) {
- refpanic ("FindVC VLRU inconsistent1");
- }
- if (tvc->vlruq.next->prev != &(tvc->vlruq)) {
- refpanic ("FindVC VLRU inconsistent2");
- }
- if (tvc->vlruq.prev->next != &(tvc->vlruq)) {
- refpanic ("FindVC VLRU inconsistent3");
- }
+ if ((VLRU.next->prev != &VLRU) || (VLRU.prev->next != &VLRU)) {
+ refpanic ("FindVC VLRU inconsistent1");
+ }
+ if (tvc->vlruq.next->prev != &(tvc->vlruq)) {
+ refpanic ("FindVC VLRU inconsistent2");
+ }
+ if (tvc->vlruq.prev->next != &(tvc->vlruq)) {
+ refpanic ("FindVC VLRU inconsistent3");
+ }
}
vcachegen++;
- }
+ }
if (flag & DO_STATS) {
- if (tvc) afs_stats_cmperf.vcacheHits++;
- else afs_stats_cmperf.vcacheMisses++;
- if (afid->Cell == LOCALCELL)
- afs_stats_cmperf.vlocalAccesses++;
- else
- afs_stats_cmperf.vremoteAccesses++;
+ if (tvc)
+ afs_stats_cmperf.vcacheHits++;
+ else
+ afs_stats_cmperf.vcacheMisses++;
+ if (afs_IsPrimaryCellNum(afid->Cell))
+ afs_stats_cmperf.vlocalAccesses++;
+ else
+ afs_stats_cmperf.vremoteAccesses++;
}
#ifdef AFS_LINUX22_ENV
#endif
#ifdef AFS_DARWIN_ENV
if (tvc)
- osi_VM_Setup(tvc);
+ osi_VM_Setup(tvc, 0);
#endif
return tvc;
} /*afs_FindVCache*/
* Parameters:
* avcp : Fill in pointer if we found one and only one.
* afid : Pointer to the fid whose cache entry we desire.
- * retry: (SGI-specific) tell the caller to drop the lock on xvcache,
+ * retry: (SGI-specific) tell the caller to drop the lock on xvcache,
* unlock the vnode, and try again.
* flags: bit 1 to specify whether to compute hit statistics. Not
* set if FindVCache is called as part of internal bookkeeping.
int afs_duplicate_nfs_fids=0;
-afs_int32 afs_NFSFindVCache(avcp, afid, lockit)
- struct vcache **avcp;
- struct VenusFid *afid;
- afs_int32 lockit;
-{ /*afs_FindVCache*/
-
+afs_int32 afs_NFSFindVCache(struct vcache **avcp, struct VenusFid *afid)
+{
register struct vcache *tvc;
afs_int32 i;
- afs_int32 retry = 0;
afs_int32 count = 0;
struct vcache *found_tvc = NULL;
AFS_STATCNT(afs_FindVCache);
+#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
loop:
+#endif
- ObtainSharedLock(&afs_xvcache,331);
+ ObtainSharedLock(&afs_xvcache,331);
i = VCHash(afid);
for(tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
/* Grab this vnode, possibly reactivating from the free list */
int vg;
AFS_GUNLOCK();
- vg = vget((struct vnode *)tvc);
+ vg = vget(AFSTOV(tvc));
AFS_GLOCK();
if (vg) {
/* This vnode no longer exists. */
/* Duplicates */
#ifdef AFS_OSF_ENV
/* Drop our reference counts. */
- vrele((struct vnode *)tvc);
- vrele((struct vnode *)found_tvc);
+ vrele(AFSTOV(tvc));
+ vrele(AFSTOV(found_tvc));
#endif
afs_duplicate_nfs_fids++;
ReleaseSharedLock(&afs_xvcache);
/* should I have a read lock on the vnode here? */
if (tvc) {
#if defined(AFS_SGI_ENV) && !defined(AFS_SGI53_ENV)
- osi_vnhold(tvc, &retry);
+ afs_int32 retry = 0;
+ osi_vnhold(tvc, &retry);
if (retry) {
count = 0;
found_tvc = (struct vcache*)0;
if (tvc) afs_stats_cmperf.vcacheHits++;
else afs_stats_cmperf.vcacheMisses++;
- if (afid->Cell == LOCALCELL)
+ if (afs_IsPrimaryCellNum(afid->Cell))
afs_stats_cmperf.vlocalAccesses++;
else
afs_stats_cmperf.vremoteAccesses++;
#if 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
+ afs_maxvcount = nvnode/2; /* limit ourselves to half the total */
+#endif
if (astatSize < afs_maxvcount) {
afs_maxvcount = astatSize;
}
}
#else /* AFS_OSF_ENV */
- freeVCList = (struct vcache *)0;
+ freeVCList = NULL;
#endif
RWLOCK_INIT(&afs_xvcache, "afs_xvcache");
freeVCList = &(tvp[0]);
for(i=0; i < astatSize-1; i++) {
tvp[i].nextfree = &(tvp[i+1]);
- }
- tvp[astatSize-1].nextfree = (struct vcache *) 0;
-#ifdef AFS_AIX32_ENV
- pin((char *)tvp, astatSize * sizeof(struct vcache)); /* XXX */
+ }
+ tvp[astatSize-1].nextfree = NULL;
+#ifdef KERNEL_HAVE_PIN
+ pin((char *)tvp, astatSize * sizeof(struct vcache)); /* XXX */
#endif
#endif
#if !defined(AFS_OSF_ENV)
afs_osi_Free(Initial_freeVCList, afs_cacheStats * sizeof(struct vcache));
#endif
-#ifdef AFS_AIX32_ENV
+#ifdef KERNEL_HAVE_PIN
unpin(Initial_freeVCList, afs_cacheStats * sizeof(struct vcache));
#endif
tvc->mvid = (struct VenusFid*)0;
}
#ifdef AFS_AIX_ENV
- aix_gnode_rele((struct vnode *)tvc);
+ aix_gnode_rele(AFSTOV(tvc));
#endif
if (tvc->linkData) {
afs_osi_Free(tvc->linkData, strlen(tvc->linkData)+1);
tvc->linkData = 0;
}
}
- /*
- * Also free the remaining ones in the Cache
+ /*
+ * Also free the remaining ones in the Cache
*/
for (i=0; i < VCSIZE; i++) {
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
git://git.openafs.org / openafs.git / blobdiff