/* Forward declarations */
static afs_int32 afs_QueueVCB(struct vcache *avc, int *slept);
+
+/*
+ * The PFlush algorithm makes use of the fact that Fid.Unique is not used in
+ * below hash algorithms. Change it if need be so that flushing algorithm
+ * doesn't move things from one hash chain to another.
+ */
+/* Don't hash on the cell; our callback-breaking code sometimes fails to compute
+ * the cell correctly, and only scans one hash bucket. */
+int VCHash(struct VenusFid *fid)
+{
+ return opr_jhash_int2(fid->Fid.Volume, fid->Fid.Vnode, 0) &
+ opr_jhash_mask(VCSIZEBITS);
+}
+/* Hash only on volume to speed up volume callbacks. */
+int VCHashV(struct VenusFid *fid)
+{
+ return opr_jhash_int(fid->Fid.Vnode, 0) & opr_jhash_mask(VCSIZEBITS);
+}
+
/*!
* Generate an index into the hash table for a given Fid.
* \param fid
/* remove entry from the volume hash table */
QRemove(&avc->vhashq);
- if (avc->mvid)
- osi_FreeSmallSpace(avc->mvid);
- avc->mvid = (struct VenusFid *)0;
+#if defined(AFS_LINUX26_ENV)
+ {
+ struct pagewriter *pw, *store;
+ struct list_head tofree;
+
+ INIT_LIST_HEAD(&tofree);
+ spin_lock(&avc->pagewriter_lock);
+ list_for_each_entry_safe(pw, store, &avc->pagewriters, link) {
+ list_del(&pw->link);
+ /* afs_osi_Free may sleep so we need to defer it */
+ list_add_tail(&pw->link, &tofree);
+ }
+ spin_unlock(&avc->pagewriter_lock);
+ list_for_each_entry_safe(pw, store, &tofree, link) {
+ list_del(&pw->link);
+ afs_osi_Free(pw, sizeof(struct pagewriter));
+ }
+ }
+#endif
+
+ if (avc->mvid.target_root)
+ osi_FreeSmallSpace(avc->mvid.target_root);
+ avc->mvid.target_root = NULL;
if (avc->linkData) {
afs_osi_Free(avc->linkData, strlen(avc->linkData) + 1);
avc->linkData = NULL;
* via which someone could try to use the vcache. It is okay to drop
* afs_xvcache at this point (if *slept is set). */
- if (!afs_shuttingdown)
+ if (afs_shuttingdown == AFS_RUNNING)
afs_QueueVCB(avc, slept);
/*
/*
* The proper value for mvstat (for root fids) is setup by the caller.
*/
- avc->mvstat = 0;
+ avc->mvstat = AFS_MVSTAT_FILE;
if (afid->Fid.Vnode == 1 && afid->Fid.Unique == 1)
- avc->mvstat = 2;
+ avc->mvstat = AFS_MVSTAT_ROOT;
if (afs_globalVFS == 0)
osi_Panic("afs globalvfs");
afs_ShakeLooseVCaches(afs_int32 anumber)
{
afs_int32 i, loop;
+ int evicted;
struct vcache *tvc;
struct afs_q *tq, *uq;
int fv_slept, defersleep = 0;
}
fv_slept = 0;
- if (osi_TryEvictVCache(tvc, &fv_slept, defersleep))
+ evicted = osi_TryEvictVCache(tvc, &fv_slept, defersleep);
+ if (evicted) {
anumber--;
+ }
if (fv_slept) {
if (loop++ > 100)
break;
+ if (!evicted) {
+ /*
+ * This vcache was busy and we slept while trying to evict it.
+ * Move this busy vcache to the head of the VLRU so vcaches
+ * following this busy vcache can be evicted during the retry.
+ */
+ QRemove(&tvc->vlruq);
+ QAdd(&VLRU, &tvc->vlruq);
+ }
goto retry; /* start over - may have raced. */
}
if (uq == &VLRU) {
AFS_RWLOCK_INIT(&avc->lock, "vcache lock");
- avc->mvid = NULL;
+ memset(&avc->mvid, 0, sizeof(avc->mvid));
avc->linkData = NULL;
avc->cbExpires = 0;
avc->opens = 0;
/* fetch the status info */
tvc = afs_GetVCache(&avc->f.fid, areq, NULL, avc);
if (!tvc)
- return ENOENT;
+ return EIO;
/* Put it back; caller has already incremented vrefCount */
afs_PutVCache(tvc);
return 0;
} else if (vType(avc) == VLNK) {
avc->f.m.Mode |= S_IFLNK;
if ((avc->f.m.Mode & 0111) == 0)
- avc->mvstat = 1;
+ avc->mvstat = AFS_MVSTAT_MTPT;
}
if (avc->f.states & CForeign) {
struct axscache *ac;
} else if (vType(avc) == VLNK) {
avc->f.m.Mode |= S_IFLNK;
if ((avc->f.m.Mode & 0111) == 0)
- avc->mvstat = 1;
+ avc->mvstat = AFS_MVSTAT_MTPT;
}
#endif
flags |= VDisconSetMode;
avc->f.m.Mode |= S_IFLNK;
}
if ((avc->f.m.Mode & 0111) == 0) {
- avc->mvstat = 1;
+ avc->mvstat = AFS_MVSTAT_MTPT;
}
}
avc->f.anyAccess = astat->AnonymousAccess;
tvc->f.states |= CForeign;
if (newvcache && (tvp->rootVnode == afid->Fid.Vnode)
&& (tvp->rootUnique == afid->Fid.Unique)) {
- tvc->mvstat = 2;
+ tvc->mvstat = AFS_MVSTAT_ROOT;
}
}
if (tvp->states & VRO)
if (tvp->states & VBackup)
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)
- tvc->mvid = (struct VenusFid *)
+ if (tvc->mvstat == AFS_MVSTAT_ROOT && tvp->dotdot.Fid.Volume != 0) {
+ if (!tvc->mvid.parent)
+ tvc->mvid.parent = (struct VenusFid *)
osi_AllocSmallSpace(sizeof(struct VenusFid));
- *tvc->mvid = tvp->dotdot;
+ *tvc->mvid.parent = tvp->dotdot;
}
afs_PutVolume(tvp, READ_LOCK);
}
tvc->f.states |= CForeign;
if (newvcache && (tvp->rootVnode == afid->Fid.Vnode)
&& (tvp->rootUnique == afid->Fid.Unique))
- tvc->mvstat = 2;
+ tvc->mvstat = AFS_MVSTAT_ROOT;
}
if (tvp->states & VRO)
tvc->f.states |= CRO;
if (tvp->states & VBackup)
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)
- tvc->mvid = (struct VenusFid *)
+ if (tvc->mvstat == AFS_MVSTAT_ROOT && tvp->dotdot.Fid.Volume != 0) {
+ if (!tvc->mvid.parent)
+ tvc->mvid.parent = (struct VenusFid *)
osi_AllocSmallSpace(sizeof(struct VenusFid));
- *tvc->mvid = tvp->dotdot;
+ *tvc->mvid.parent = tvp->dotdot;
}
}
/* now copy ".." entry back out of volume structure, if necessary */
if (newvcache && (tvolp->rootVnode == afid->Fid.Vnode)
&& (tvolp->rootUnique == afid->Fid.Unique)) {
- tvc->mvstat = 2;
+ tvc->mvstat = AFS_MVSTAT_ROOT;
}
- if (tvc->mvstat == 2 && tvolp->dotdot.Fid.Volume != 0) {
- if (!tvc->mvid)
- tvc->mvid = (struct VenusFid *)
+ if (tvc->mvstat == AFS_MVSTAT_ROOT && tvolp->dotdot.Fid.Volume != 0) {
+ if (!tvc->mvid.parent)
+ tvc->mvid.parent = (struct VenusFid *)
osi_AllocSmallSpace(sizeof(struct VenusFid));
- *tvc->mvid = tvolp->dotdot;
+ *tvc->mvid.parent = tvolp->dotdot;
}
/* stat the file */
* Now, copy ".." entry back out of volume structure, if
* necessary
*/
- if (tvc->mvstat == 2 && tvp->dotdot.Fid.Volume != 0) {
- if (!tvc->mvid)
- tvc->mvid = (struct VenusFid *)
+ if (tvc->mvstat == AFS_MVSTAT_ROOT && tvp->dotdot.Fid.Volume != 0) {
+ if (!tvc->mvid.parent)
+ tvc->mvid.parent = (struct VenusFid *)
osi_AllocSmallSpace(sizeof(struct VenusFid));
- *tvc->mvid = tvp->dotdot;
+ *tvc->mvid.parent = tvp->dotdot;
}
}
/* store the stat on the file */
for (tq = VLRU.prev; tq != &VLRU; tq = uq) {
tvc = QTOV(tq);
uq = QPrev(tq);
- if (tvc->mvid) {
- osi_FreeSmallSpace(tvc->mvid);
- tvc->mvid = (struct VenusFid *)0;
+ if (tvc->mvid.target_root) {
+ osi_FreeSmallSpace(tvc->mvid.target_root);
+ tvc->mvid.target_root = NULL;
}
#ifdef AFS_AIX_ENV
aix_gnode_rele(AFSTOV(tvc));
*/
for (i = 0; i < VCSIZE; i++) {
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
- if (tvc->mvid) {
- osi_FreeSmallSpace(tvc->mvid);
- tvc->mvid = (struct VenusFid *)0;
+ if (tvc->mvid.target_root) {
+ osi_FreeSmallSpace(tvc->mvid.target_root);
+ tvc->mvid.target_root = NULL;
}
#ifdef AFS_AIX_ENV
if (tvc->v.v_gnode)
git://git.openafs.org / openafs.git / blobdiff