#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_stats.h" /* statistics */
#include "afs/nfsclient.h"
#include "afs/exporter.h"
#include "afs/afs_osidnlc.h"
+#include "afs/afs_dynroot.h"
-
-extern struct DirEntry *afs_dir_GetBlob();
-
+extern struct vcache *afs_globalVp;
afs_int32 afs_bkvolpref = 0;
afs_int32 afs_bulkStatsDone;
*
* NOTE: this function returns a held volume structure in *volpp if it returns 0!
*/
-int
-EvalMountPoint(register struct vcache *avc, struct vcache *advc,
- struct volume **avolpp, register struct vrequest *areq)
+static int
+EvalMountData(char type, char *data, afs_uint32 states, afs_uint32 cellnum,
+ struct volume **avolpp, struct vrequest *areq,
+ afs_uint32 *acellidxp, afs_uint32 *avolnump,
+ afs_uint32 *avnoidp, afs_uint32 *auniqp)
{
- afs_int32 code;
struct volume *tvp = 0;
struct VenusFid tfid;
struct cell *tcell;
- char *cpos, *volnamep;
- char type, *buf;
+ char *cpos, *volnamep = NULL;
+ char *buf, *endptr;
afs_int32 prefetch; /* 1=>None 2=>RO 3=>BK */
afs_int32 mtptCell, assocCell = 0, hac = 0;
afs_int32 samecell, roname, len;
+ afs_uint32 volid = 0, cellidx, vnoid = 0, uniq = 0;
- AFS_STATCNT(EvalMountPoint);
-#ifdef notdef
- if (avc->mvid && (avc->states & CMValid))
- return 0; /* done while racing */
-#endif
- *avolpp = NULL;
- code = afs_HandleLink(avc, areq);
- if (code)
- return code;
-
- /* Determine which cell and volume the mointpoint goes to */
- type = avc->linkData[0]; /* '#'=>Regular '%'=>RW */
- cpos = afs_strchr(&avc->linkData[1], ':'); /* if cell name present */
+ /* Start by figuring out and finding the cell */
+ cpos = afs_strchr(data, ':'); /* if cell name present */
if (cpos) {
volnamep = cpos + 1;
*cpos = 0;
- tcell = afs_GetCellByName(&avc->linkData[1], READ_LOCK);
+ if ((afs_strtoi_r(data, &endptr, &cellnum) == 0) &&
+ (endptr == cpos))
+ tcell = afs_GetCell(cellnum, READ_LOCK);
+ else {
+ tcell = afs_GetCellByName(data, READ_LOCK);
+ cellnum = 0;
+ }
*cpos = ':';
+ } else if (cellnum) {
+ volnamep = data;
+ tcell = afs_GetCell(cellnum, READ_LOCK);
} else {
- volnamep = &avc->linkData[1];
- tcell = afs_GetCell(avc->fid.Cell, READ_LOCK);
+ /* No cellname or cellnum; return ENODEV */
+ return ENODEV;
}
- if (!tcell)
+ if (!tcell) {
+ /* no cell found; return ENODEV */
return ENODEV;
+ }
+ cellidx = tcell->cellIndex;
mtptCell = tcell->cellNum; /* The cell for the mountpoint */
if (tcell->lcellp) {
hac = 1; /* has associated cell */
}
afs_PutCell(tcell, READ_LOCK);
+ /* If there's nothing to look up, we can't proceed */
+ if (!*volnamep)
+ return ENODEV;
+
+ /* cell found. figure out volume */
+ cpos = afs_strchr(volnamep, ':');
+ if (cpos)
+ *cpos = 0;
+
+ /* Look for an all-numeric volume ID */
+ if ((afs_strtoi_r(volnamep, &endptr, &volid) == 0) &&
+ ((endptr == cpos) || (!*endptr)))
+ {
+ /* Ok. Is there a vnode and uniq? */
+ if (cpos) {
+ char *vnodep = (char *)(cpos + 1);
+ char *uniqp = NULL;
+ if ((!*vnodep) /* no vnode after colon */
+ || !(uniqp = afs_strchr(vnodep, ':')) /* no colon for uniq */
+ || (!*(++uniqp)) /* no uniq after colon */
+ || (afs_strtoi_r(vnodep, &endptr, &vnoid) != 0) /* bad vno */
+ || (*endptr != ':') /* bad vnode field */
+ || (afs_strtoi_r(uniqp, &endptr, &uniq) != 0) /* bad uniq */
+ || (*endptr)) /* anything after uniq */
+ {
+ *cpos = ':';
+ /* sorry. vnode and uniq, or nothing */
+ return ENODEV;
+ }
+ }
+ } else
+ volid = 0;
+
+ /*
+ * If the volume ID was all-numeric, and they didn't ask for a
+ * pointer to the volume structure, then just return the number
+ * as-is. This is currently only used for handling name lookups
+ * in the dynamic mount directory.
+ */
+ if (volid && !avolpp) {
+ if (cpos)
+ *cpos = ':';
+ goto done;
+ }
+
+ /*
+ * If the volume ID was all-numeric, and the type was '%', then
+ * assume whoever made the mount point knew what they were doing,
+ * and don't second-guess them by forcing use of a RW volume when
+ * they gave the ID of something else.
+ */
+ if (volid && type == '%') {
+ tfid.Fid.Volume = volid; /* remember BK volume */
+ tfid.Cell = mtptCell;
+ tvp = afs_GetVolume(&tfid, areq, WRITE_LOCK); /* get the new one */
+ if (cpos) /* one way or another we're done */
+ *cpos = ':';
+ if (!tvp)
+ return ENODEV; /* afs_GetVolume failed; return ENODEV */
+ goto done;
+ }
+
/* Is volume name a "<n>.backup" or "<n>.readonly" name */
len = strlen(volnamep);
roname = ((len > 9) && (strcmp(&volnamep[len - 9], ".readonly") == 0))
|| ((len > 7) && (strcmp(&volnamep[len - 7], ".backup") == 0));
/* When we cross mountpoint, do we stay in the same cell */
- samecell = (avc->fid.Cell == mtptCell) || (hac
- && (avc->fid.Cell ==
- assocCell));
+ samecell = (cellnum == mtptCell) || (hac && (cellnum == assocCell));
/* Decide whether to prefetch the BK, or RO. Also means we want the BK or
* RO.
* want to prefetch the RO volume.
*/
if ((type == '#') && !roname) {
- if (afs_bkvolpref && samecell && (avc->states & CBackup))
+ if (afs_bkvolpref && samecell && (states & CBackup))
prefetch = 3; /* Prefetch the BK */
- else if (!samecell || (avc->states & CRO))
+ else if (!samecell || (states & CRO))
prefetch = 2; /* Prefetch the RO */
else
prefetch = 1; /* Do not prefetch */
/* Get the volume struct. Unless this volume name has ".readonly" or
* ".backup" in it, this will get the volume struct for the RW volume.
* The RO volume will be prefetched if requested (but not returned).
+ * Set up to use volname first.
*/
tvp = afs_GetVolumeByName(volnamep, mtptCell, prefetch, areq, WRITE_LOCK);
}
osi_FreeSmallSpace(buf);
}
-
+ /* done with volname */
+ if (cpos)
+ *cpos = ':';
if (!tvp)
return ENODEV; /* Couldn't find the volume */
+ else
+ volid = tvp->volume;
/* Don't cross mountpoint from a BK to a BK volume */
- if ((avc->states & CBackup) && (tvp->states & VBackup)) {
+ if ((states & CBackup) && (tvp->states & VBackup)) {
afs_PutVolume(tvp, WRITE_LOCK);
return ENODEV;
}
return ENODEV; /* oops, can't do it */
}
+done:
+ if (acellidxp)
+ *acellidxp = cellidx;
+ if (avolnump)
+ *avolnump = volid;
+ if (avnoidp)
+ *avnoidp = vnoid;
+ if (auniqp)
+ *auniqp = uniq;
+ if (avolpp)
+ *avolpp = tvp;
+ else if (tvp)
+ afs_PutVolume(tvp, WRITE_LOCK);
+ return 0;
+}
+
+int
+EvalMountPoint(struct vcache *avc, struct vcache *advc,
+ struct volume **avolpp, struct vrequest *areq)
+{
+ afs_int32 code;
+ afs_uint32 avnoid, auniq;
+
+ AFS_STATCNT(EvalMountPoint);
+#ifdef notdef
+ if (avc->mvid && (avc->f.states & CMValid))
+ return 0; /* done while racing */
+#endif
+ *avolpp = NULL;
+ code = afs_HandleLink(avc, areq);
+ if (code)
+ return code;
+
+ /* Determine which cell and volume the mointpoint goes to */
+ code = EvalMountData(avc->linkData[0], avc->linkData + 1,
+ avc->f.states, avc->f.fid.Cell, avolpp, areq, 0, 0,
+ &avnoid, &auniq);
+ if (code) return code;
+
+ if (!avnoid)
+ avnoid = 1;
+
+ if (!auniq)
+ auniq = 1;
+
if (avc->mvid == 0)
avc->mvid =
(struct VenusFid *)osi_AllocSmallSpace(sizeof(struct VenusFid));
- avc->mvid->Cell = tvp->cell;
- avc->mvid->Fid.Volume = tvp->volume;
- avc->mvid->Fid.Vnode = 1;
- avc->mvid->Fid.Unique = 1;
- avc->states |= CMValid;
+ avc->mvid->Cell = (*avolpp)->cell;
+ avc->mvid->Fid.Volume = (*avolpp)->volume;
+ avc->mvid->Fid.Vnode = avnoid;
+ avc->mvid->Fid.Unique = auniq;
+ avc->f.states |= CMValid;
/* Used to: if the mount point is stored within a backup volume,
* then we should only update the parent pointer information if
*
* Next two lines used to be under this if:
*
- * if (!(avc->states & CBackup) || tvp->dotdot.Fid.Volume == 0)
+ * if (!(avc->f.states & CBackup) || tvp->dotdot.Fid.Volume == 0)
*
* Now: update mount point back pointer on every call, so that we handle
* multiple mount points better. This way, when du tries to go back
* cd'ing via a new path to a volume will reset the ".." pointer
* to the new path.
*/
- tvp->mtpoint = avc->fid; /* setup back pointer to mtpoint */
+ (*avolpp)->mtpoint = avc->f.fid; /* setup back pointer to mtpoint */
+
if (advc)
- tvp->dotdot = advc->fid;
+ (*avolpp)->dotdot = advc->f.fid;
- *avolpp = tvp;
return 0;
}
if (tvc->mvstat != 1)
return 0;
- /* Is the call to VerifyVCache really necessary? */
- code = afs_VerifyVCache(tvc, areq);
- if (code)
- goto done;
if (canblock) {
+ /* Is the call to VerifyVCache really necessary? */
+ code = afs_VerifyVCache(tvc, areq);
+ if (code)
+ goto done;
+
ObtainWriteLock(&tvc->lock, 599);
code = EvalMountPoint(tvc, NULL, &tvolp, areq);
ReleaseWriteLock(&tvc->lock);
if (code)
goto done;
if (tvolp) {
- tvolp->dotdot = tvc->fid;
- tvolp->dotdot.Fid.Vnode = tvc->parentVnode;
- tvolp->dotdot.Fid.Unique = tvc->parentUnique;
+ tvolp->dotdot = tvc->f.fid;
+ tvolp->dotdot.Fid.Vnode = tvc->f.parent.vnode;
+ tvolp->dotdot.Fid.Unique = tvc->f.parent.unique;
}
}
- if (tvc->mvid && (tvc->states & CMValid)) {
+ if (tvc->mvid && (tvc->f.states & CMValid)) {
if (!canblock) {
afs_int32 retry;
do {
retry = 0;
ObtainWriteLock(&afs_xvcache, 597);
- root_vp = afs_FindVCache(tvc->mvid, &retry, 0);
+ root_vp = afs_FindVCache(tvc->mvid, &retry, IS_WLOCK);
if (root_vp && retry) {
ReleaseWriteLock(&afs_xvcache);
afs_PutVCache(root_vp);
goto done;
}
#ifdef AFS_DARWIN80_ENV
- root_vp->m.Type = VDIR;
+ root_vp->f.m.Type = VDIR;
AFS_GUNLOCK();
- code = afs_darwin_finalizevnode(root_vp, NULL, NULL, 0);
+ code = afs_darwin_finalizevnode(root_vp, NULL, NULL, 0, 0);
AFS_GLOCK();
if (code) goto done;
vnode_ref(AFSTOV(root_vp));
#endif
- if (tvolp) {
+ if (tvolp && !afs_InReadDir(root_vp)) {
/* Is this always kosher? Perhaps we should instead use
* NBObtainWriteLock to avoid potential deadlock.
*/
}
int
-afs_ENameOK(register char *aname)
+afs_ENameOK(char *aname)
{
- register int tlen;
+ int tlen;
AFS_STATCNT(ENameOK);
tlen = strlen(aname);
}
static int
-afs_getsysname(register struct vrequest *areq, register struct vcache *adp,
- register char *bufp, int *num, char **sysnamelist[])
+afs_getsysname(struct vrequest *areq, struct vcache *adp,
+ char *bufp, int *num, char **sysnamelist[])
{
- register struct unixuser *au;
- register afs_int32 error;
+ struct unixuser *au;
+ afs_int32 error;
AFS_STATCNT(getsysname);
if (!afs_nfsexporter)
strcpy(bufp, (*sysnamelist)[0]);
else {
- au = afs_GetUser(areq->uid, adp->fid.Cell, 0);
+ au = afs_GetUser(areq->uid, adp->f.fid.Cell, READ_LOCK);
if (au->exporter) {
- error = EXP_SYSNAME(au->exporter, (char *)0, sysnamelist, num);
+ error = EXP_SYSNAME(au->exporter, (char *)0, sysnamelist, num, 0);
if (error) {
strcpy(bufp, "@sys");
- afs_PutUser(au, 0);
+ afs_PutUser(au, READ_LOCK);
return -1;
} else {
strcpy(bufp, (*sysnamelist)[0]);
}
} else
strcpy(bufp, afs_sysname);
- afs_PutUser(au, 0);
+ afs_PutUser(au, READ_LOCK);
}
return 0;
}
void
-Check_AtSys(register struct vcache *avc, const char *aname,
+Check_AtSys(struct vcache *avc, const char *aname,
struct sysname_info *state, struct vrequest *areq)
{
int num = 0;
if (AFS_EQ_ATSYS(aname)) {
state->offset = 0;
- state->name = (char *)osi_AllocLargeSpace(AFS_SMALLOCSIZ);
+ state->name = (char *)osi_AllocLargeSpace(MAXSYSNAME);
state->allocked = 1;
state->index =
afs_getsysname(areq, avc, state->name, &num, sysnamelist);
}
int
-Next_AtSys(register struct vcache *avc, struct vrequest *areq,
+Next_AtSys(struct vcache *avc, struct vrequest *areq,
struct sysname_info *state)
{
int num = afs_sysnamecount;
/* Check for the initial state of aname != "@sys" in Check_AtSys */
if (state->offset == -1 && state->allocked == 0) {
- register char *tname;
+ char *tname;
/* Check for .*@sys */
for (tname = state->name; *tname; tname++)
} else
return 0; /* .*@sys doesn't match either */
} else {
- register struct unixuser *au;
- register afs_int32 error;
+ struct unixuser *au;
+ afs_int32 error;
*sysnamelist = afs_sysnamelist;
if (afs_nfsexporter) {
- au = afs_GetUser(areq->uid, avc->fid.Cell, 0);
+ au = afs_GetUser(areq->uid, avc->f.fid.Cell, READ_LOCK);
if (au->exporter) {
error =
- EXP_SYSNAME(au->exporter, (char *)0, sysnamelist, num);
+ EXP_SYSNAME(au->exporter, (char *)0, sysnamelist, &num, 0);
if (error) {
+ afs_PutUser(au, READ_LOCK);
return 0;
}
}
- afs_PutUser(au, 0);
+ afs_PutUser(au, READ_LOCK);
}
if (++(state->index) >= num || !(*sysnamelist)[(unsigned int)state->index])
return 0; /* end of list */
{
int nentries; /* # of entries to prefetch */
int nskip; /* # of slots in the LRU queue to skip */
+#ifdef AFS_DARWIN80_ENV
+ int npasses = 0;
+ struct vnode *lruvp;
+#endif
struct vcache *lruvcp; /* vcache ptr of our goal pos in LRU queue */
struct dcache *dcp; /* chunk containing the dir block */
- char *statMemp; /* status memory block */
- char *cbfMemp; /* callback and fid memory block */
afs_size_t temp; /* temp for holding chunk length, &c. */
struct AFSFid *fidsp; /* file IDs were collecting */
struct AFSCallBack *cbsp; /* call back pointers */
AFSCBFids fidParm; /* file ID parm for bulk stat */
AFSBulkStats statParm; /* stat info parm for bulk stat */
int fidIndex = 0; /* which file were stating */
- struct conn *tcp = 0; /* conn for call */
+ struct afs_conn *tcp = 0; /* conn for call */
AFSCBs cbParm; /* callback parm for bulk stat */
struct server *hostp = 0; /* host we got callback from */
long startTime; /* time we started the call,
* for callback expiration base
*/
+ int ftype[4] = {VNON, VREG, VDIR, VLNK}; /* verify type is as expected */
afs_size_t statSeqNo = 0; /* Valued of file size to detect races */
int code; /* error code */
long newIndex; /* new index in the dir */
+ struct DirBuffer entry; /* Buffer for dir manipulation */
struct DirEntry *dirEntryp; /* dir entry we are examining */
int i;
struct VenusFid afid; /* file ID we are using now */
afs_int32 retry; /* handle low-level SGI MP race conditions */
long volStates; /* flags from vol structure */
struct volume *volp = 0; /* volume ptr */
- struct VenusFid dotdot;
+ struct VenusFid dotdot = {0, {0, 0, 0}};
int flagIndex = 0; /* First file with bulk fetch flag set */
- int inlinebulk = 0; /* Did we use InlineBulk RPC or not? */
+ struct rx_connection *rxconn;
XSTATS_DECLS;
-#ifdef AFS_DARWIN80_ENV
- panic("bulkstatus doesn't work on AFS_DARWIN80_ENV. don't call it");
-#endif
+ dotdot.Cell = 0;
+ dotdot.Fid.Unique = 0;
+ dotdot.Fid.Vnode = 0;
+
/* first compute some basic parameters. We dont want to prefetch more
* than a fraction of the cache in any given call, and we want to preserve
* a portion of the LRU queue in any event, so as to avoid thrashing
* one for fids and callbacks, and one for stat info. Well set
* up our pointers to the memory from there, too.
*/
- statMemp = osi_AllocLargeSpace(nentries * sizeof(AFSFetchStatus));
- statsp = (struct AFSFetchStatus *)statMemp;
- cbfMemp =
- osi_AllocLargeSpace(nentries *
- (sizeof(AFSCallBack) + sizeof(AFSFid)));
- fidsp = (AFSFid *) cbfMemp;
- cbsp = (AFSCallBack *) (cbfMemp + nentries * sizeof(AFSFid));
+ statsp = (AFSFetchStatus *)
+ osi_Alloc(AFSCBMAX * sizeof(AFSFetchStatus));
+ fidsp = (AFSFid *) osi_AllocLargeSpace(nentries * sizeof(AFSFid));
+ cbsp = (AFSCallBack *)
+ osi_Alloc(AFSCBMAX * sizeof(AFSCallBack));
/* next, we must iterate over the directory, starting from the specified
* cookie offset (dirCookie), and counting out nentries file entries.
* 1. The cache data is being fetched by another process.
* 2. The cache data is no longer valid
*/
- while ((adp->states & CStatd)
+ while ((adp->f.states & CStatd)
&& (dcp->dflags & DFFetching)
- && hsame(adp->m.DataVersion, dcp->f.versionNo)) {
+ && hsame(adp->f.m.DataVersion, dcp->f.versionNo)) {
afs_Trace4(afs_iclSetp, CM_TRACE_DCACHEWAIT, ICL_TYPE_STRING,
__FILE__, ICL_TYPE_INT32, __LINE__, ICL_TYPE_POINTER, dcp,
ICL_TYPE_INT32, dcp->dflags);
ObtainReadLock(&adp->lock);
ObtainReadLock(&dcp->lock);
}
- if (!(adp->states & CStatd)
- || !hsame(adp->m.DataVersion, dcp->f.versionNo)) {
+ if (!(adp->f.states & CStatd)
+ || !hsame(adp->f.m.DataVersion, dcp->f.versionNo)) {
ReleaseReadLock(&dcp->lock);
ReleaseReadLock(&adp->lock);
afs_PutDCache(dcp);
* and it is safe to set the status information for this file.
*/
statSeqNo = bulkStatCounter++;
+ /* ensure against wrapping */
+ if (statSeqNo == 0)
+ statSeqNo = bulkStatCounter++;
/* now we have dir data in the cache, so scan the dir page */
fidIndex = 0;
dirCookie = newIndex << 5;
/* get a ptr to the dir entry */
- dirEntryp =
- (struct DirEntry *)afs_dir_GetBlob(dcp, newIndex);
- if (!dirEntryp)
+ code = afs_dir_GetBlob(dcp, newIndex, &entry);
+ if (code)
break;
+ dirEntryp = (struct DirEntry *)entry.data;
/* dont copy more than we have room for */
if (fidIndex >= nentries) {
- DRelease((struct buffer *)dirEntryp, 0);
+ DRelease(&entry, 0);
break;
}
* also make us skip "." and probably "..", unless it has
* disappeared from the cache since we did our namei call.
*/
- tfid.Cell = adp->fid.Cell;
- tfid.Fid.Volume = adp->fid.Fid.Volume;
+ tfid.Cell = adp->f.fid.Cell;
+ tfid.Fid.Volume = adp->f.fid.Fid.Volume;
tfid.Fid.Vnode = ntohl(dirEntryp->fid.vnode);
tfid.Fid.Unique = ntohl(dirEntryp->fid.vunique);
do {
retry = 0;
ObtainWriteLock(&afs_xvcache, 130);
- tvcp = afs_FindVCache(&tfid, &retry, 0 /* no stats | LRU */ );
+ tvcp = afs_FindVCache(&tfid, &retry, IS_WLOCK /* no stats | LRU */ );
if (tvcp && retry) {
ReleaseWriteLock(&afs_xvcache);
afs_PutVCache(tvcp);
}
} while (tvcp && retry);
if (!tvcp) { /* otherwise, create manually */
- tvcp = afs_NewVCache(&tfid, hostp);
+ tvcp = afs_NewBulkVCache(&tfid, hostp, statSeqNo);
if (tvcp)
{
- ObtainWriteLock(&tvcp->lock, 505);
- ReleaseWriteLock(&afs_xvcache);
- afs_RemoveVCB(&tfid);
- ReleaseWriteLock(&tvcp->lock);
+ ObtainWriteLock(&tvcp->lock, 505);
+#ifdef AFS_DARWIN80_ENV
+ /* use even/odd hack to guess file versus dir.
+ let links be reaped. oh well. */
+ if (dirEntryp->fid.vnode & 1)
+ tvcp->f.m.Type = VDIR;
+ else
+ tvcp->f.m.Type = VREG;
+ /* finalize to a best guess */
+ afs_darwin_finalizevnode(tvcp, VTOAFS(adp), NULL, 0, 1);
+ /* re-acquire usecount that finalizevnode disposed of */
+ vnode_ref(AFSTOV(tvcp));
+#endif
+ ReleaseWriteLock(&afs_xvcache);
+ afs_RemoveVCB(&tfid);
+ ReleaseWriteLock(&tvcp->lock);
} else {
- ReleaseWriteLock(&afs_xvcache);
+ ReleaseWriteLock(&afs_xvcache);
}
} else {
ReleaseWriteLock(&afs_xvcache);
}
if (!tvcp)
{
+ DRelease(&entry, 0);
ReleaseReadLock(&dcp->lock);
ReleaseReadLock(&adp->lock);
+ afs_PutDCache(dcp);
goto done; /* can happen if afs_NewVCache fails */
}
-#ifdef AFS_DARWIN80_ENV
- if (tvcp->states & CVInit) {
- /* XXX don't have status yet, so creating the vnode is
- not yet useful. we would get CDeadVnode set, and the
- upcoming PutVCache will cause the vcache to be flushed &
- freed, which in turn means the bulkstatus results won't
- be used */
- }
-#endif
/* 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 length will be ignored when afs_ProcessFS is
* called with new stats. */
#ifdef AFS_SGI_ENV
- if (!(tvcp->states & (CStatd | CBulkFetching))
+ if (!(tvcp->f.states & CStatd)
+ && (!((tvcp->f.states & CBulkFetching) &&
+ (tvcp->f.m.Length != statSeqNo)))
&& (tvcp->execsOrWriters <= 0)
&& !afs_DirtyPages(tvcp)
&& !AFS_VN_MAPPED((vnode_t *) tvcp))
#else
- if (!(tvcp->states & (CStatd | CBulkFetching))
+ if (!(tvcp->f.states & CStatd)
+ && (!((tvcp->f.states & CBulkFetching) &&
+ (tvcp->f.m.Length != statSeqNo)))
&& (tvcp->execsOrWriters <= 0)
&& !afs_DirtyPages(tvcp))
#endif
* CBulkFetching state bit and the value in the file size.
* It is safe to set the status only if the CBulkFetching
* flag is still set and the value in the file size does
- * not change.
+ * not change. NewBulkVCache sets us up for the new ones.
+ * Set up the rest here.
*
* Don't fetch status for dirty files. We need to
* preserve the value of the file size. We could
* flush the pages, but it wouldn't be worthwhile.
*/
+ if (!(tvcp->f.states & CBulkFetching)) {
+ tvcp->f.states |= CBulkFetching;
+ tvcp->f.m.Length = statSeqNo;
+ }
memcpy((char *)(fidsp + fidIndex), (char *)&tfid.Fid,
sizeof(*fidsp));
- tvcp->states |= CBulkFetching;
- tvcp->m.Length = statSeqNo;
fidIndex++;
}
afs_PutVCache(tvcp);
* used by this dir entry.
*/
temp = afs_dir_NameBlobs(dirEntryp->name) << 5;
- DRelease((struct buffer *)dirEntryp, 0);
+ DRelease(&entry, 0);
if (temp <= 0)
break;
dirCookie += temp;
/* start the timer; callback expirations are relative to this */
startTime = osi_Time();
- tcp = afs_Conn(&adp->fid, areqp, SHARED_LOCK);
+ tcp = afs_Conn(&adp->f.fid, areqp, SHARED_LOCK, &rxconn);
if (tcp) {
- hostp = tcp->srvr->server;
+ hostp = tcp->parent->srvr->server;
+
+ for (i = 0; i < fidIndex; i++) {
+ /* we must set tvcp->callback before the BulkStatus call, so
+ * we can detect concurrent InitCallBackState's */
+
+ afid.Cell = adp->f.fid.Cell;
+ afid.Fid.Volume = adp->f.fid.Fid.Volume;
+ afid.Fid.Vnode = fidsp[i].Vnode;
+ afid.Fid.Unique = fidsp[i].Unique;
+
+ do {
+ retry = 0;
+ ObtainReadLock(&afs_xvcache);
+ tvcp = afs_FindVCache(&afid, &retry, 0 /* !stats&!lru */);
+ ReleaseReadLock(&afs_xvcache);
+ } while (tvcp && retry);
+
+ if (!tvcp) {
+ continue;
+ }
+
+ if ((tvcp->f.states & CBulkFetching) &&
+ (tvcp->f.m.Length == statSeqNo)) {
+ tvcp->callback = hostp;
+ }
+
+ afs_PutVCache(tvcp);
+ tvcp = NULL;
+ }
+
XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_BULKSTATUS);
- RX_AFS_GUNLOCK();
- if (!(tcp->srvr->server->flags & SNO_INLINEBULK)) {
+ if (!(tcp->parent->srvr->server->flags & SNO_INLINEBULK)) {
+ RX_AFS_GUNLOCK();
code =
- RXAFS_InlineBulkStatus(tcp->id, &fidParm, &statParm,
+ RXAFS_InlineBulkStatus(rxconn, &fidParm, &statParm,
&cbParm, &volSync);
+ RX_AFS_GLOCK();
if (code == RXGEN_OPCODE) {
- tcp->srvr->server->flags |= SNO_INLINEBULK;
- inlinebulk = 0;
+ tcp->parent->srvr->server->flags |= SNO_INLINEBULK;
+ RX_AFS_GUNLOCK();
code =
- RXAFS_BulkStatus(tcp->id, &fidParm, &statParm,
+ RXAFS_BulkStatus(rxconn, &fidParm, &statParm,
&cbParm, &volSync);
- } else
- inlinebulk = 1;
+ RX_AFS_GLOCK();
+ } else if (!code) {
+ /* The InlineBulkStatus call itself succeeded, but we
+ * may have failed to stat the first entry. Use the error
+ * from the first entry for processing. */
+ code = (&statsp[0])->errorCode;
+ }
} else {
- inlinebulk = 0;
+ RX_AFS_GUNLOCK();
code =
- RXAFS_BulkStatus(tcp->id, &fidParm, &statParm, &cbParm,
+ RXAFS_BulkStatus(rxconn, &fidParm, &statParm, &cbParm,
&volSync);
+ RX_AFS_GLOCK();
}
- RX_AFS_GLOCK();
XSTATS_END_TIME;
} else
code = -1;
} while (afs_Analyze
- (tcp, code, &adp->fid, areqp, AFS_STATS_FS_RPCIDX_BULKSTATUS,
+ (tcp, rxconn, code, &adp->f.fid, areqp, AFS_STATS_FS_RPCIDX_BULKSTATUS,
SHARED_LOCK, NULL));
/* now, if we didnt get the info, bail out. */
/* we need vol flags to create the entries properly */
dotdot.Fid.Volume = 0;
- volp = afs_GetVolume(&adp->fid, areqp, READ_LOCK);
+ volp = afs_GetVolume(&adp->f.fid, areqp, READ_LOCK);
if (volp) {
volStates = volp->states;
if (volp->dotdot.Fid.Volume != 0)
reskip:
nskip = afs_cacheStats / 2; /* preserved fraction of the cache */
ObtainReadLock(&afs_xvcache);
+#ifdef AFS_DARWIN80_ENV
+ reskip2:
+#endif
if (QEmpty(&VLRU)) {
/* actually a serious error, probably should panic. Probably will
* panic soon, oh well. */
refpanic("Bulkstat VLRU inconsistent");
}
for (tq = VLRU.next; tq != &VLRU; tq = QNext(tq)) {
- if (--nskip <= 0)
- break;
- else if (QNext(QPrev(tq)) != tq) {
+ if (--nskip <= 0) {
+#ifdef AFS_DARWIN80_ENV
+ if ((!(QTOV(tq)->f.states & CDeadVnode)&&!(QTOV(tq)->f.states & CVInit)))
+#endif
+ break;
+ }
+ if (QNext(QPrev(tq)) != tq) {
BStvc = QTOV(tq);
refpanic("BulkStat VLRU inconsistent");
}
* doesn't hurt nearly as much.
*/
retry = 0;
+#ifdef AFS_DARWIN80_ENV
+ if (((lruvcp->f.states & CDeadVnode)||(lruvcp->f.states & CVInit))) {
+ if (npasses == 0) {
+ nskip = 1;
+ npasses++;
+ goto reskip2;
+ } else
+ panic("Can't find non-dead vnode in VLRU\n");
+ }
+ lruvp = AFSTOV(lruvcp);
+ if (vnode_get(lruvp)) /* this bumps ref count */
+ retry = 1;
+ else if (vnode_ref(lruvp)) {
+ AFS_GUNLOCK();
+ /* AFSTOV(lruvcp) may be NULL */
+ vnode_put(lruvp);
+ AFS_GLOCK();
+ retry = 1;
+ }
+#else
osi_vnhold(lruvcp, &retry);
+#endif
ReleaseReadLock(&afs_xvcache); /* could be read lock */
if (retry)
goto reskip;
-#ifdef AFS_DARWIN80_ENV
- vnode_get(AFSTOV(lruvcp));
-#endif
/* otherwise, merge in the info. We have to be quite careful here,
* since we need to ensure that we don't merge old info over newer
for (i = 0; i < fidIndex; i++) {
if ((&statsp[i])->errorCode)
continue;
- afid.Cell = adp->fid.Cell;
- afid.Fid.Volume = adp->fid.Fid.Volume;
+ afid.Cell = adp->f.fid.Cell;
+ afid.Fid.Volume = adp->f.fid.Fid.Volume;
afid.Fid.Vnode = fidsp[i].Vnode;
afid.Fid.Unique = fidsp[i].Unique;
do {
retry = 0;
ObtainReadLock(&afs_xvcache);
- tvcp = afs_FindVCache(&afid, &retry, 0 /* !stats&!lru */ );
+ tvcp = afs_FindVCache(&afid, &retry, 0/* !stats&!lru */);
ReleaseReadLock(&afs_xvcache);
} while (tvcp && retry);
* matches the value we placed there when we set the CBulkFetching
* flag, then someone else has done something with this node,
* and we may not have the latest status information for this
- * file. Leave the entry alone.
+ * file. Leave the entry alone. There's also a file type
+ * change here, for OSX bulkstat support.
*/
- if (!(tvcp->states & CBulkFetching) || (tvcp->m.Length != statSeqNo)) {
+ if (!(tvcp->f.states & CBulkFetching)
+ || (tvcp->f.m.Length != statSeqNo)
+ || (ftype[(&statsp[i])->FileType] != vType(tvcp))) {
flagIndex++;
ReleaseWriteLock(&tvcp->lock);
afs_PutVCache(tvcp);
*tvcp->mvid = dotdot;
}
+#ifdef AFS_DARWIN80_ENV
+ if (((lruvcp->f.states & CDeadVnode)||(lruvcp->f.states & CVInit)))
+ panic("vlru control point went dead\n");
+#endif
+
ObtainWriteLock(&afs_xvcache, 132);
if ((VLRU.next->prev != &VLRU) || (VLRU.prev->next != &VLRU)) {
refpanic("Bulkstat VLRU inconsistent2");
/* We need to check the flags again. We may have missed
* something while we were waiting for a lock.
*/
- if (!(tvcp->states & CBulkFetching) || (tvcp->m.Length != statSeqNo)) {
+ if (!(tvcp->f.states & CBulkFetching) || (tvcp->f.m.Length != statSeqNo)) {
flagIndex++;
ReleaseWriteLock(&tvcp->lock);
ReleaseWriteLock(&afs_xcbhash);
* loaded, so we can tell if we use it before it gets
* recycled.
*/
- tvcp->states |= CBulkStat;
- tvcp->states &= ~CBulkFetching;
+ tvcp->f.states |= CBulkStat;
+ tvcp->f.states &= ~CBulkFetching;
flagIndex++;
afs_bulkStatsDone++;
/* merge in vol info */
if (volStates & VRO)
- tvcp->states |= CRO;
+ tvcp->f.states |= CRO;
if (volStates & VBackup)
- tvcp->states |= CBackup;
+ tvcp->f.states |= CBackup;
if (volStates & VForeign)
- tvcp->states |= CForeign;
+ tvcp->f.states |= CForeign;
/* merge in the callback info */
- tvcp->states |= CTruth;
+ tvcp->f.states |= CTruth;
/* get ptr to the callback we are interested in */
tcbp = cbsp + i;
if (tcbp->ExpirationTime != 0) {
tvcp->cbExpires = tcbp->ExpirationTime + startTime;
tvcp->callback = hostp;
- tvcp->states |= CStatd;
+ tvcp->f.states |= CStatd;
afs_QueueCallback(tvcp, CBHash(tcbp->ExpirationTime), volp);
- } else if (tvcp->states & CRO) {
+ } else if (tvcp->f.states & CRO) {
/* ordinary callback on a read-only volume -- AFS 3.2 style */
tvcp->cbExpires = 3600 + startTime;
tvcp->callback = hostp;
- tvcp->states |= CStatd;
+ tvcp->f.states |= CStatd;
afs_QueueCallback(tvcp, CBHash(3600), volp);
} else {
tvcp->callback = 0;
- tvcp->states &= ~(CStatd | CUnique);
+ tvcp->f.states &= ~(CStatd | CUnique);
afs_DequeueCallback(tvcp);
- if ((tvcp->states & CForeign) || (vType(tvcp) == VDIR))
+ if ((tvcp->f.states & CForeign) || (vType(tvcp) == VDIR))
osi_dnlc_purgedp(tvcp); /* if it (could be) a directory */
}
+#ifdef AFS_DARWIN80_ENV
+ /* reclaim->FlushVCache will need xcbhash */
+ if (((tvcp->f.states & CDeadVnode)||(tvcp->f.states & CVInit))) {
+ ReleaseWriteLock(&afs_xcbhash);
+ /* passing in a parent hangs getting the vnode lock */
+ code = afs_darwin_finalizevnode(tvcp, NULL, NULL, 0, 1);
+ if (code) {
+ /* It's gonna get recycled - shouldn't happen */
+ tvcp->callback = 0;
+ tvcp->f.states &= ~(CStatd | CUnique);
+ afs_DequeueCallback(tvcp);
+ if ((tvcp->f.states & CForeign) || (vType(tvcp) == VDIR))
+ osi_dnlc_purgedp(tvcp); /* if it (could be) a directory */
+ } else
+ /* re-acquire the usecount that finalizevnode disposed of */
+ vnode_ref(AFSTOV(tvcp));
+ } else
+#endif
ReleaseWriteLock(&afs_xcbhash);
ReleaseWriteLock(&tvcp->lock);
} /* for all files we got back */
/* finally return the pointer into the LRU queue */
+#ifdef AFS_DARWIN80_ENV
+ if (((lruvcp->f.states & CDeadVnode)||(lruvcp->f.states & CVInit)))
+ panic("vlru control point went dead before put\n");
+ AFS_GUNLOCK();
+ vnode_put(lruvp);
+ vnode_rele(lruvp);
+ AFS_GLOCK();
+#else
afs_PutVCache(lruvcp);
+#endif
done:
/* Be sure to turn off the CBulkFetching flags */
for (i = flagIndex; i < fidIndex; i++) {
- afid.Cell = adp->fid.Cell;
- afid.Fid.Volume = adp->fid.Fid.Volume;
+ afid.Cell = adp->f.fid.Cell;
+ afid.Fid.Volume = adp->f.fid.Fid.Volume;
afid.Fid.Vnode = fidsp[i].Vnode;
afid.Fid.Unique = fidsp[i].Unique;
do {
retry = 0;
ObtainReadLock(&afs_xvcache);
- tvcp = afs_FindVCache(&afid, &retry, 0 /* !stats&!lru */ );
+ tvcp = afs_FindVCache(&afid, &retry, 0 /* !stats&!lru */);
ReleaseReadLock(&afs_xvcache);
} while (tvcp && retry);
- if (tvcp != NULL && (tvcp->states & CBulkFetching)
- && (tvcp->m.Length == statSeqNo)) {
- tvcp->states &= ~CBulkFetching;
- }
if (tvcp != NULL) {
+ if ((tvcp->f.states & CBulkFetching)
+ && (tvcp->f.m.Length == statSeqNo)) {
+ tvcp->f.states &= ~CBulkFetching;
+ }
afs_PutVCache(tvcp);
}
}
if (volp)
afs_PutVolume(volp, READ_LOCK);
- /* If we did the InlineBulk RPC pull out the return code */
- if (inlinebulk) {
- if ((&statsp[0])->errorCode) {
- afs_Analyze(tcp, (&statsp[0])->errorCode, &adp->fid, areqp,
- AFS_STATS_FS_RPCIDX_BULKSTATUS, SHARED_LOCK, NULL);
- code = (&statsp[0])->errorCode;
- }
- } else {
- code = 0;
- }
done2:
- osi_FreeLargeSpace(statMemp);
- osi_FreeLargeSpace(cbfMemp);
+ osi_FreeLargeSpace((char *)fidsp);
+ osi_Free((char *)statsp, AFSCBMAX * sizeof(AFSFetchStatus));
+ osi_Free((char *)cbsp, AFSCBMAX * sizeof(AFSCallBack));
return code;
}
/* was: (AFS_DEC_ENV) || defined(AFS_OSF30_ENV) || defined(AFS_NCR_ENV) */
#ifdef AFS_DARWIN80_ENV
-#define AFSDOBULK 0
+int AFSDOBULK = 1;
#else
static int AFSDOBULK = 1;
#endif
+static_inline int
+osi_lookup_isdot(const char *aname)
+{
+#ifdef AFS_SUN5_ENV
+ if (!aname[0]) {
+ /* in Solaris, we can get passed "" as a path component if we are the
+ * root directory, e.g. after a call to chroot. It is equivalent to
+ * looking up "." */
+ return 1;
+ }
+#endif /* AFS_SUN5_ENV */
+ if (aname[0] == '.' && !aname[1]) {
+ return 1;
+ }
+ return 0;
+}
+
int
-#ifdef AFS_OSF_ENV
-afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct AFS_UCRED *acred, int opflag, int wantparent)
-#elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
-afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct pathname *pnp, int flags, struct vnode *rdir, struct AFS_UCRED *acred)
+#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct pathname *pnp, int flags, struct vnode *rdir, afs_ucred_t *acred)
#elif defined(UKERNEL)
-afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct AFS_UCRED *acred, int flags)
+afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acred, int flags)
#else
-afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct AFS_UCRED *acred)
+afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acred)
#endif
{
struct vrequest treq;
char *tname = NULL;
- register struct vcache *tvc = 0;
- register afs_int32 code;
- register afs_int32 bulkcode = 0;
+ struct vcache *tvc = 0;
+ afs_int32 code;
+ afs_int32 bulkcode = 0;
int pass = 0, hit = 0;
+ int force_eval = afs_fakestat_enable ? 0 : 1;
long dirCookie;
extern afs_int32 afs_mariner; /*Writing activity to log? */
afs_hyper_t versionNo;
AFS_STATCNT(afs_lookup);
afs_InitFakeStat(&fakestate);
+ AFS_DISCON_LOCK();
+
if ((code = afs_InitReq(&treq, acred)))
goto done;
-#ifdef AFS_OSF_ENV
- ndp->ni_dvp = AFSTOV(adp);
-#endif /* AFS_OSF_ENV */
+ if (afs_fakestat_enable && adp->mvstat == 1) {
+ if (strcmp(aname, ".directory") == 0)
+ tryEvalOnly = 1;
+ }
#if defined(AFS_DARWIN_ENV)
/* Workaround for MacOSX Finder, which tries to look for
if (strcmp(aname, "Contents") == 0)
tryEvalOnly = 1;
}
+ if (afs_fakestat_enable && adp->mvstat == 2) {
+ if (strncmp(aname, "._", 2) == 0)
+ tryEvalOnly = 1;
+ }
#endif
if (tryEvalOnly)
code = afs_TryEvalFakeStat(&adp, &fakestate, &treq);
else
code = afs_EvalFakeStat(&adp, &fakestate, &treq);
+
+ /*printf("Code is %d\n", code);*/
+
if (tryEvalOnly && adp->mvstat == 1)
code = ENOENT;
if (code)
*avcp = NULL; /* Since some callers don't initialize it */
bulkcode = 0;
- if (!(adp->states & CStatd)) {
+ if (!(adp->f.states & CStatd) && !afs_InReadDir(adp)) {
if ((code = afs_VerifyVCache2(adp, &treq))) {
goto done;
}
if (adp->mvstat == 2 && aname[0] == '.' && aname[1] == '.' && !aname[2]) {
/* looking up ".." in root via special hacks */
if (adp->mvid == (struct VenusFid *)0 || adp->mvid->Fid.Volume == 0) {
-#ifdef AFS_OSF_ENV
- extern struct vcache *afs_globalVp;
- if (adp == afs_globalVp) {
- struct vnode *rvp = AFSTOV(adp);
-/*
- ndp->ni_vp = rvp->v_vfsp->vfs_vnodecovered;
- ndp->ni_dvp = ndp->ni_vp;
- VN_HOLD(*avcp);
-*/
- code = ENODEV;
- goto done;
- }
-#endif
code = ENODEV;
goto done;
}
/* otherwise we have the fid here, so we use it */
+ /*printf("Getting vcache\n");*/
tvc = afs_GetVCache(adp->mvid, &treq, NULL, NULL);
afs_Trace3(afs_iclSetp, CM_TRACE_GETVCDOTDOT, ICL_TYPE_FID, adp->mvid,
ICL_TYPE_POINTER, tvc, ICL_TYPE_INT32, code);
* I'm not fiddling with the LRUQ here, either, perhaps I should, or else
* invent a lightweight version of GetVCache.
*/
- if (aname[0] == '.' && !aname[1]) { /* special case */
+ if (osi_lookup_isdot(aname)) { /* special case */
ObtainReadLock(&afs_xvcache);
osi_vnhold(adp, 0);
ReleaseReadLock(&afs_xvcache);
goto done;
}
+ /*
+ * Special case lookup of ".." in the dynamic mount directory.
+ * The parent of this directory is _always_ the AFS root volume.
+ */
+ if (afs_IsDynrootMount(adp) &&
+ aname[0] == '.' && aname[1] == '.' && !aname[2]) {
+
+ ObtainReadLock(&afs_xvcache);
+ osi_vnhold(afs_globalVp, 0);
+ ReleaseReadLock(&afs_xvcache);
+#ifdef AFS_DARWIN80_ENV
+ vnode_get(AFSTOV(afs_globalVp));
+#endif
+ code = 0;
+ *avcp = tvc = afs_globalVp;
+ hit = 1;
+ goto done;
+ }
+
+ /*
+ * Special case lookups in the dynamic mount directory.
+ * The names here take the form cell:volume, similar to a mount point.
+ * EvalMountData parses that and returns a cell and volume ID, which
+ * we use to construct the appropriate dynroot Fid.
+ */
+ if (afs_IsDynrootMount(adp)) {
+ struct VenusFid tfid;
+ afs_uint32 cellidx, volid, vnoid, uniq;
+
+ code = EvalMountData('%', aname, 0, 0, NULL, &treq, &cellidx, &volid, &vnoid, &uniq);
+ if (code)
+ goto done;
+ /* If a vnode was returned, it's not a real mount point */
+ if (vnoid > 1) {
+ struct cell *tcell = afs_GetCellByIndex(cellidx, READ_LOCK);
+ tfid.Cell = tcell->cellNum;
+ afs_PutCell(tcell, READ_LOCK);
+ tfid.Fid.Vnode = vnoid;
+ tfid.Fid.Volume = volid;
+ tfid.Fid.Unique = uniq;
+ } else {
+ afs_GetDynrootMountFid(&tfid);
+ tfid.Fid.Vnode = VNUM_FROM_TYPEID(VN_TYPE_MOUNT, cellidx << 2);
+ tfid.Fid.Unique = volid;
+ }
+ *avcp = tvc = afs_GetVCache(&tfid, &treq, NULL, NULL);
+ code = (tvc ? 0 : ENOENT);
+ hit = 1;
+ goto done;
+ }
+
+#ifdef AFS_LINUX26_ENV
+ /*
+ * Special case of the dynamic mount volume in a static root.
+ * This is really unfortunate, but we need this for the translator.
+ */
+ if (adp == afs_globalVp && !afs_GetDynrootEnable() &&
+ !strcmp(aname, AFS_DYNROOT_MOUNTNAME)) {
+ struct VenusFid tfid;
+
+ afs_GetDynrootMountFid(&tfid);
+ *avcp = tvc = afs_GetVCache(&tfid, &treq, NULL, NULL);
+ code = 0;
+ hit = 1;
+ goto done;
+ }
+#endif
+
Check_AtSys(adp, aname, &sysState, &treq);
tname = sysState.name;
}
{ /* sub-block just to reduce stack usage */
- register struct dcache *tdc;
+ struct dcache *tdc;
afs_size_t dirOffset, dirLen;
struct VenusFid tfid;
/* now we have to lookup the next fid */
- tdc =
- afs_GetDCache(adp, (afs_size_t) 0, &treq, &dirOffset, &dirLen, 1);
+ if (afs_InReadDir(adp))
+ tdc = adp->dcreaddir;
+ else
+ tdc = afs_GetDCache(adp, (afs_size_t) 0, &treq,
+ &dirOffset, &dirLen, 1);
if (!tdc) {
*avcp = NULL; /* redundant, but harmless */
code = EIO;
* cases we need to worry about:
* 1. The cache data is being fetched by another process.
* 2. The cache data is no longer valid
+ *
+ * If a readdir is in progress _in this thread_, it has a shared
+ * lock on the vcache and has obtained current data, so we just
+ * use that. This eliminates several possible deadlocks.
*/
- while ((adp->states & CStatd)
- && (tdc->dflags & DFFetching)
- && hsame(adp->m.DataVersion, tdc->f.versionNo)) {
- ReleaseReadLock(&tdc->lock);
- ReleaseReadLock(&adp->lock);
- afs_osi_Sleep(&tdc->validPos);
- ObtainReadLock(&adp->lock);
- ObtainReadLock(&tdc->lock);
- }
- if (!(adp->states & CStatd)
- || !hsame(adp->m.DataVersion, tdc->f.versionNo)) {
- ReleaseReadLock(&tdc->lock);
- ReleaseReadLock(&adp->lock);
- afs_PutDCache(tdc);
- if (tname && tname != aname)
- osi_FreeLargeSpace(tname);
- goto redo;
+ if (!afs_InReadDir(adp)) {
+ while ((adp->f.states & CStatd)
+ && (tdc->dflags & DFFetching)
+ && hsame(adp->f.m.DataVersion, tdc->f.versionNo)) {
+ ReleaseReadLock(&tdc->lock);
+ ReleaseReadLock(&adp->lock);
+ afs_osi_Sleep(&tdc->validPos);
+ ObtainReadLock(&adp->lock);
+ ObtainReadLock(&tdc->lock);
+ }
+ if (!(adp->f.states & CStatd)
+ || !hsame(adp->f.m.DataVersion, tdc->f.versionNo)) {
+ ReleaseReadLock(&tdc->lock);
+ ReleaseReadLock(&adp->lock);
+ afs_PutDCache(tdc);
+ if (tname && tname != aname)
+ osi_FreeLargeSpace(tname);
+ goto redo;
+ }
}
/* Save the version number for when we call osi_dnlc_enter */
tname = sysState.name;
ReleaseReadLock(&tdc->lock);
- afs_PutDCache(tdc);
-
- if (code == ENOENT && afs_IsDynroot(adp) && dynrootRetry) {
+ if (!afs_InReadDir(adp))
+ afs_PutDCache(tdc);
+ if (code == ENOENT && afs_IsDynroot(adp) && dynrootRetry && !tryEvalOnly) {
+ struct cell *tc;
+ char *cn = (tname[0] == '.') ? tname + 1 : tname;
ReleaseReadLock(&adp->lock);
+ /* confirm it's not just hushed */
+ tc = afs_GetCellByName(cn, WRITE_LOCK);
+ if (tc) {
+ if (tc->states & CHush) {
+ tc->states &= ~CHush;
+ ReleaseWriteLock(&tc->lock);
+ afs_DynrootInvalidate();
+ goto redo;
+ }
+ ReleaseWriteLock(&tc->lock);
+ }
+ /* Allow a second dynroot retry if the cell was hushed before */
dynrootRetry = 0;
if (tname[0] == '.')
afs_LookupAFSDB(tname + 1);
}
/* new fid has same cell and volume */
- tfid.Cell = adp->fid.Cell;
- tfid.Fid.Volume = adp->fid.Fid.Volume;
+ tfid.Cell = adp->f.fid.Cell;
+ tfid.Fid.Volume = adp->f.fid.Fid.Volume;
afs_Trace4(afs_iclSetp, CM_TRACE_LOOKUP, ICL_TYPE_POINTER, adp,
ICL_TYPE_STRING, tname, ICL_TYPE_FID, &tfid,
ICL_TYPE_INT32, code);
if (code) {
if (code != ENOENT) {
- printf("LOOKUP dirLookupOff -> %d\n", code);
+ /*printf("LOOKUP dirLookupOff -> %d\n", code);*/
}
goto done;
}
/* prefetch some entries, if the dir is currently open. The variable
* dirCookie tells us where to start prefetching from.
*/
- if (AFSDOBULK && adp->opens > 0 && !(adp->states & CForeign)
- && !afs_IsDynroot(adp)) {
+ if (!AFS_IS_DISCONNECTED &&
+ AFSDOBULK && adp->opens > 0 && !(adp->f.states & CForeign)
+ && !afs_IsDynroot(adp) && !afs_InReadDir(adp)) {
afs_int32 retry;
/* if the entry is not in the cache, or is in the cache,
* but hasn't been statd, then do a bulk stat operation.
ReleaseReadLock(&afs_xvcache);
} while (tvc && retry);
- if (!tvc || !(tvc->states & CStatd))
+ if (!tvc || !(tvc->f.states & CStatd))
bulkcode = afs_DoBulkStat(adp, dirCookie, &treq);
else
bulkcode = 0;
/* if the vcache isn't usable, release it */
- if (tvc && !(tvc->states & CStatd)) {
+ if (tvc && !(tvc->f.states & CStatd)) {
afs_PutVCache(tvc);
tvc = NULL;
}
*/
if (!tvc) {
afs_int32 cached = 0;
- if (!tfid.Fid.Unique && (adp->states & CForeign)) {
+ if (!tfid.Fid.Unique && (adp->f.states & CForeign)) {
tvc = afs_LookupVCache(&tfid, &treq, &cached, adp, tname);
}
if (!tvc && !bulkcode) { /* lookup failed or wasn't called */
} /* sub-block just to reduce stack usage */
if (tvc) {
- int force_eval = afs_fakestat_enable ? 0 : 1;
-
- if (adp->states & CForeign)
- tvc->states |= CForeign;
- tvc->parentVnode = adp->fid.Fid.Vnode;
- tvc->parentUnique = adp->fid.Fid.Unique;
- tvc->states &= ~CBulkStat;
+ if (adp->f.states & CForeign)
+ tvc->f.states |= CForeign;
+ tvc->f.parent.vnode = adp->f.fid.Fid.Vnode;
+ tvc->f.parent.unique = adp->f.fid.Fid.Unique;
+ tvc->f.states &= ~CBulkStat;
if (afs_fakestat_enable == 2 && tvc->mvstat == 1) {
ObtainSharedLock(&tvc->lock, 680);
force_eval = 1;
ReleaseReadLock(&tvc->lock);
}
-#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
+ if (tvc->mvstat == 1 && (tvc->f.states & CMValid) && tvc->mvid != NULL)
+ force_eval = 1; /* This is now almost for free, get it correct */
+
+#if defined(UKERNEL)
if (!(flags & AFS_LOOKUP_NOEVAL))
/* don't eval mount points */
-#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
+#endif /* UKERNEL */
if (tvc->mvstat == 1 && force_eval) {
/* a mt point, possibly unevaluated */
struct volume *tvolp;
}
/* next, we want to continue using the target of the mt point */
- if (tvc->mvid && (tvc->states & CMValid)) {
+ if (tvc->mvid && (tvc->f.states & CMValid)) {
struct vcache *uvc;
/* now lookup target, to set .. pointer */
afs_Trace2(afs_iclSetp, CM_TRACE_LOOKUP1,
ICL_TYPE_POINTER, tvc, ICL_TYPE_FID,
- &tvc->fid);
+ &tvc->f.fid);
uvc = tvc; /* remember for later */
if (tvolp && (tvolp->states & VForeign)) {
* be located (a Multics "connection failure"). If the volume is
* read-only, we try flushing this entry from the cache and trying
* again. */
- if (pass == 0) {
- struct volume *tv;
- tv = afs_GetVolume(&adp->fid, &treq, READ_LOCK);
- if (tv) {
- if (tv->states & VRO) {
- pass = 1; /* try this *once* */
- ObtainWriteLock(&afs_xcbhash, 495);
- afs_DequeueCallback(adp);
- /* re-stat to get later version */
- adp->states &= ~CStatd;
- ReleaseWriteLock(&afs_xcbhash);
- osi_dnlc_purgedp(adp);
+ if (!AFS_IS_DISCONNECTED) {
+ if (pass == 0) {
+ struct volume *tv;
+ tv = afs_GetVolume(&adp->f.fid, &treq, READ_LOCK);
+ if (tv) {
+ if (tv->states & VRO) {
+ pass = 1; /* try this *once* */
+ ObtainWriteLock(&afs_xcbhash, 495);
+ afs_DequeueCallback(adp);
+ /* re-stat to get later version */
+ adp->f.states &= ~CStatd;
+ ReleaseWriteLock(&afs_xcbhash);
+ osi_dnlc_purgedp(adp);
+ afs_PutVolume(tv, READ_LOCK);
+ goto redo;
+ }
afs_PutVolume(tv, READ_LOCK);
- goto redo;
- }
- afs_PutVolume(tv, READ_LOCK);
+ }
}
+ code = ENOENT;
+ } else {
+ code = ENETDOWN;
}
- code = ENOENT;
}
done:
if (tname != aname && tname)
osi_FreeLargeSpace(tname);
if (code == 0) {
-#ifdef AFS_OSF_ENV
- /* Handle RENAME; only need to check rename "." */
- if (opflag == RENAME && wantparent && *ndp->ni_next == 0) {
- if (!FidCmp(&(tvc->fid), &(adp->fid))) {
- afs_PutVCache(*avcp);
- *avcp = NULL;
- afs_PutFakeStat(&fakestate);
- return afs_CheckCode(EISDIR, &treq, 18);
- }
- }
-#endif /* AFS_OSF_ENV */
if (afs_mariner)
afs_AddMarinerName(aname, tvc);
-#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
- if (!(flags & AFS_LOOKUP_NOEVAL))
+#if defined(UKERNEL)
+ if (!(flags & AFS_LOOKUP_NOEVAL)) {
/* Here we don't enter the name into the DNLC because we want the
- * evaluated mount dir to be there (the vcache for the mounted volume)
- * rather than the vc of the mount point itself. we can still find the
- * mount point's vc in the vcache by its fid. */
-#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
- if (!hit) {
+ * evaluated mount dir to be there (the vcache for the mounted
+ * volume) rather than the vc of the mount point itself. We can
+ * still find the mount point's vc in the vcache by its fid. */
+#endif /* UKERNEL */
+ if (!hit && force_eval) {
osi_dnlc_enter(adp, aname, tvc, &versionNo);
} else {
#ifdef AFS_LINUX20_ENV
code = afs_VerifyVCache(tvc, &treq);
#else
afs_PutFakeStat(&fakestate);
+ AFS_DISCON_UNLOCK();
return 0; /* can't have been any errors if hit and !code */
#endif
}
+#if defined(UKERNEL)
+ }
+#endif
}
if (bulkcode)
code = bulkcode;
- else
- code = afs_CheckCode(code, &treq, 19);
+
+ code = afs_CheckCode(code, &treq, 19);
if (code) {
/* If there is an error, make sure *avcp is null.
* Alphas panic otherwise - defect 10719.
}
afs_PutFakeStat(&fakestate);
+ AFS_DISCON_UNLOCK();
return code;
}
git://git.openafs.org / openafs.git / blobdiff