struct volume *tvp = 0;
struct VenusFid tfid;
struct cell *tcell;
- char *cpos, *volnamep;
+ char *cpos, *volnamep = NULL;
char *buf, *endptr;
afs_int32 prefetch; /* 1=>None 2=>RO 3=>BK */
afs_int32 mtptCell, assocCell = 0, hac = 0;
/* Start by figuring out and finding the cell */
cpos = afs_strchr(data, ':'); /* if cell name present */
if (cpos) {
+ afs_uint32 mtptCellnum;
volnamep = cpos + 1;
*cpos = 0;
- if ((afs_strtoi_r(data, &endptr, &cellnum) == 0) &&
- (endptr == cpos))
- tcell = afs_GetCell(cellnum, READ_LOCK);
- else {
+ if ((afs_strtoi_r(data, &endptr, &mtptCellnum) == 0) &&
+ (endptr == cpos)) {
+ tcell = afs_GetCell(mtptCellnum, READ_LOCK);
+ } else {
tcell = afs_GetCellByName(data, READ_LOCK);
- cellnum = 0;
}
*cpos = ':';
} else if (cellnum) {
* in the dynamic mount directory.
*/
if (volid && !avolpp) {
- if (*cpos)
+ if (cpos)
*cpos = ':';
goto done;
}
* Don't know why we do this. Would have still found it in above call - jpm.
*/
if (!tvp && (prefetch == 2) && len < AFS_SMALLOCSIZ - 10) {
- buf = (char *)osi_AllocSmallSpace(len + 10);
+ buf = osi_AllocSmallSpace(len + 10);
strcpy(buf, volnamep);
afs_strcat(buf, ".readonly");
auniq = 1;
if (avc->mvid == 0)
- avc->mvid =
- (struct VenusFid *)osi_AllocSmallSpace(sizeof(struct VenusFid));
+ avc->mvid = osi_AllocSmallSpace(sizeof(struct VenusFid));
avc->mvid->Cell = (*avolpp)->cell;
avc->mvid->Fid.Volume = (*avolpp)->volume;
avc->mvid->Fid.Vnode = avnoid;
if (!afs_nfsexporter)
strcpy(bufp, (*sysnamelist)[0]);
else {
- au = afs_GetUser(areq->uid, adp->f.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, 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;
}
if (AFS_EQ_ATSYS(aname)) {
state->offset = 0;
- state->name = (char *)osi_AllocLargeSpace(MAXSYSNAME);
+ state->name = osi_AllocLargeSpace(MAXSYSNAME);
state->allocked = 1;
state->index =
afs_getsysname(areq, avc, state->name, &num, sysnamelist);
if ((tname > state->name + 4) && (AFS_EQ_ATSYS(tname - 4))) {
state->offset = (tname - 4) - state->name;
- tname = (char *)osi_AllocLargeSpace(AFS_LRALLOCSIZ);
+ tname = osi_AllocLargeSpace(AFS_LRALLOCSIZ);
strncpy(tname, state->name, state->offset);
state->name = tname;
state->allocked = 1;
*sysnamelist = afs_sysnamelist;
if (afs_nfsexporter) {
- au = afs_GetUser(areq->uid, avc->f.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, 0);
if (error) {
- afs_PutUser(au, 0);
+ 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 */
return 1;
}
+static int
+afs_CheckBulkStatus(struct afs_conn *tc, int nFids, AFSBulkStats *statParm,
+ AFSCBs *cbParm)
+{
+ int i;
+ int code;
+
+ if (statParm->AFSBulkStats_len != nFids || cbParm->AFSCBs_len != nFids) {
+ afs_warn("afs: BulkFetchStatus length %u/%u, expected %u\n",
+ (unsigned)statParm->AFSBulkStats_len,
+ (unsigned)cbParm->AFSCBs_len, nFids);
+ afs_BadFetchStatus(tc);
+ return VBUSY;
+ }
+ for (i = 0; i < nFids; i++) {
+ if (statParm->AFSBulkStats_val[i].errorCode) {
+ continue;
+ }
+ code = afs_CheckFetchStatus(tc, &statParm->AFSBulkStats_val[i]);
+ if (code) {
+ return code;
+ }
+ }
+
+ return 0;
+}
+
extern int BlobScan(struct dcache * afile, afs_int32 ablob);
/* called with an unlocked directory and directory cookie. Areqp
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 */
struct volume *volp = 0; /* volume ptr */
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;
dotdot.Cell = 0;
dotdot.Fid.Unique = 0;
* one for fids and callbacks, and one for stat info. Well set
* up our pointers to the memory from there, too.
*/
- statsp = (AFSFetchStatus *)
- osi_Alloc(AFSCBMAX * sizeof(AFSFetchStatus));
- fidsp = (AFSFid *) osi_AllocLargeSpace(nentries * sizeof(AFSFid));
- cbsp = (AFSCallBack *)
- osi_Alloc(AFSCBMAX * sizeof(AFSCallBack));
+ statsp = osi_Alloc(AFSCBMAX * sizeof(AFSFetchStatus));
+ fidsp = osi_AllocLargeSpace(nentries * sizeof(AFSFid));
+ cbsp = 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.
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(dirEntryp, 0);
+ DRelease(&entry, 0);
break;
}
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, AFSTOV(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(dirEntryp, 0);
+ DRelease(&entry, 0);
ReleaseReadLock(&dcp->lock);
ReleaseReadLock(&adp->lock);
afs_PutDCache(dcp);
* used by this dir entry.
*/
temp = afs_dir_NameBlobs(dirEntryp->name) << 5;
- DRelease(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->f.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);
- if (!(tcp->srvr->server->flags & SNO_INLINEBULK)) {
- retryonce:
+ 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);
RX_AFS_GLOCK();
- } else {
- inlinebulk = 1;
- if (!code && ((&statsp[0])->errorCode)) {
- /*
- * If this is an error needing retry, do so.
- * Retryable errors are all whole-volume or
- * whole-server.
- */
- if (afs_Analyze(tcp, (&statsp[0])->errorCode,
- &adp->f.fid, areqp,
- AFS_STATS_FS_RPCIDX_BULKSTATUS,
- SHARED_LOCK, NULL) != 0)
- goto retryonce;
- }
}
} else {
- inlinebulk = 0;
RX_AFS_GUNLOCK();
code =
- RXAFS_BulkStatus(tcp->id, &fidParm, &statParm, &cbParm,
+ RXAFS_BulkStatus(rxconn, &fidParm, &statParm, &cbParm,
&volSync);
RX_AFS_GLOCK();
}
XSTATS_END_TIME;
+
+ if (code == 0) {
+ code = afs_CheckBulkStatus(tcp, fidIndex, &statParm, &cbParm);
+ }
} else
code = -1;
+ /* make sure we give afs_Analyze a chance to retry,
+ * but if the RPC succeeded we may have entries to merge.
+ * if we wipe code with one entry's status we get bogus failures.
+ */
} while (afs_Analyze
- (tcp, code, &adp->f.fid, areqp, AFS_STATS_FS_RPCIDX_BULKSTATUS,
+ (tcp, rxconn, code ? code : (&statsp[0])->errorCode,
+ &adp->f.fid, areqp, AFS_STATS_FS_RPCIDX_BULKSTATUS,
SHARED_LOCK, NULL));
/* now, if we didnt get the info, bail out. */
do {
retry = 0;
ObtainReadLock(&afs_xvcache);
- tvcp = afs_FindVCache(&afid, &retry, FIND_CDEAD /* !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->f.states & CBulkFetching) || (tvcp->f.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);
/* now copy ".." entry back out of volume structure, if necessary */
if (tvcp->mvstat == 2 && (dotdot.Fid.Volume != 0)) {
if (!tvcp->mvid)
- tvcp->mvid = (struct VenusFid *)
- osi_AllocSmallSpace(sizeof(struct VenusFid));
+ tvcp->mvid = osi_AllocSmallSpace(sizeof(struct VenusFid));
*tvcp->mvid = dotdot;
}
afs_DequeueCallback(tvcp);
if ((tvcp->f.states & CForeign) || (vType(tvcp) == VDIR))
osi_dnlc_purgedp(tvcp); /* if it (could be) a directory */
- } else {
+ } else
/* re-acquire the usecount that finalizevnode disposed of */
vnode_ref(AFSTOV(tvcp));
- }
} else
#endif
ReleaseWriteLock(&afs_xcbhash);
do {
retry = 0;
ObtainReadLock(&afs_xvcache);
- tvcp = afs_FindVCache(&afid, &retry, FIND_CDEAD /* !stats&!lru */);
+ tvcp = afs_FindVCache(&afid, &retry, 0 /* !stats&!lru */);
ReleaseReadLock(&afs_xvcache);
} while (tvcp && retry);
if (tvcp != NULL) {
if (volp)
afs_PutVolume(volp, READ_LOCK);
- /* If we did the InlineBulk RPC pull out the return code */
- if (inlinebulk && code == 0) {
- if ((&statsp[0])->errorCode) {
- afs_Analyze(tcp, (&statsp[0])->errorCode, &adp->f.fid, areqp,
- AFS_STATS_FS_RPCIDX_BULKSTATUS, SHARED_LOCK, NULL);
- code = (&statsp[0])->errorCode;
- }
- } else {
- code = 0;
- }
done2:
osi_FreeLargeSpace((char *)fidsp);
osi_Free((char *)statsp, AFSCBMAX * sizeof(AFSFetchStatus));
}
/* was: (AFS_DEC_ENV) || defined(AFS_OSF30_ENV) || defined(AFS_NCR_ENV) */
+#ifdef AFS_DARWIN80_ENV
+int AFSDOBULK = 0;
+#else
static int AFSDOBULK = 1;
+#endif
static_inline int
osi_lookup_isdot(const char *aname)
afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acred)
#endif
{
- struct vrequest treq;
+ struct vrequest *treq = NULL;
char *tname = NULL;
struct vcache *tvc = 0;
afs_int32 code;
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;
int no_read_access = 0;
struct sysname_info sysState; /* used only for @sys checking */
afs_InitFakeStat(&fakestate);
AFS_DISCON_LOCK();
-
- if ((code = afs_InitReq(&treq, acred)))
+
+ if ((code = afs_CreateReq(&treq, acred)))
goto done;
if (afs_fakestat_enable && adp->mvstat == 1) {
#endif
if (tryEvalOnly)
- code = afs_TryEvalFakeStat(&adp, &fakestate, &treq);
+ code = afs_TryEvalFakeStat(&adp, &fakestate, treq);
else
- code = afs_EvalFakeStat(&adp, &fakestate, &treq);
+ code = afs_EvalFakeStat(&adp, &fakestate, treq);
/*printf("Code is %d\n", code);*/
if (code)
goto done;
- *avcp = NULL; /* Since some callers don't initialize it */
-
/* come back to here if we encounter a non-existent object in a read-only
* volume's directory */
-
redo:
*avcp = NULL; /* Since some callers don't initialize it */
bulkcode = 0;
if (!(adp->f.states & CStatd) && !afs_InReadDir(adp)) {
- if ((code = afs_VerifyVCache2(adp, &treq))) {
+ if ((code = afs_VerifyVCache2(adp, treq))) {
goto done;
}
} else
}
/* otherwise we have the fid here, so we use it */
/*printf("Getting vcache\n");*/
- tvc = afs_GetVCache(adp->mvid, &treq, NULL, NULL);
+ 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);
*avcp = tvc;
}
/* now check the access */
- if (treq.uid != adp->last_looker) {
- if (!afs_AccessOK(adp, PRSFS_LOOKUP, &treq, CHECK_MODE_BITS)) {
+ if (treq->uid != adp->last_looker) {
+ if (!afs_AccessOK(adp, PRSFS_LOOKUP, treq, CHECK_MODE_BITS)) {
*avcp = NULL;
code = EACCES;
goto done;
} else
- adp->last_looker = treq.uid;
+ adp->last_looker = treq->uid;
}
/* Check for read access as well. We need read access in order to
* stat files, but not to stat subdirectories. */
- if (!afs_AccessOK(adp, PRSFS_READ, &treq, CHECK_MODE_BITS))
+ if (!afs_AccessOK(adp, PRSFS_READ, treq, CHECK_MODE_BITS))
no_read_access = 1;
/* special case lookup of ".". Can we check for it sooner in this code,
struct VenusFid tfid;
afs_uint32 cellidx, volid, vnoid, uniq;
- code = EvalMountData('%', aname, 0, 0, NULL, &treq, &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 */
tfid.Fid.Vnode = VNUM_FROM_TYPEID(VN_TYPE_MOUNT, cellidx << 2);
tfid.Fid.Unique = volid;
}
- *avcp = tvc = afs_GetVCache(&tfid, &treq, NULL, NULL);
+ *avcp = tvc = afs_GetVCache(&tfid, treq, NULL, NULL);
code = (tvc ? 0 : ENOENT);
hit = 1;
goto done;
struct VenusFid tfid;
afs_GetDynrootMountFid(&tfid);
- *avcp = tvc = afs_GetVCache(&tfid, &treq, NULL, NULL);
+ *avcp = tvc = afs_GetVCache(&tfid, treq, NULL, NULL);
code = 0;
hit = 1;
goto done;
}
#endif
- Check_AtSys(adp, aname, &sysState, &treq);
+ Check_AtSys(adp, aname, &sysState, treq);
tname = sysState.name;
/* 1st Check_AtSys and lookup by tname is required here, for now,
if (afs_InReadDir(adp))
tdc = adp->dcreaddir;
else
- tdc = afs_GetDCache(adp, (afs_size_t) 0, &treq,
+ tdc = afs_GetDCache(adp, (afs_size_t) 0, treq,
&dirOffset, &dirLen, 1);
if (!tdc) {
*avcp = NULL; /* redundant, but harmless */
&dirCookie);
/* If the first lookup doesn't succeed, maybe it's got @sys in the name */
- while (code == ENOENT && Next_AtSys(adp, &treq, &sysState))
+ while (code == ENOENT && Next_AtSys(adp, treq, &sysState))
code =
afs_dir_LookupOffset(tdc, sysState.name, &tfid.Fid,
&dirCookie);
} while (tvc && retry);
if (!tvc || !(tvc->f.states & CStatd))
- bulkcode = afs_DoBulkStat(adp, dirCookie, &treq);
+ bulkcode = afs_DoBulkStat(adp, dirCookie, treq);
else
bulkcode = 0;
if (!tvc) {
afs_int32 cached = 0;
if (!tfid.Fid.Unique && (adp->f.states & CForeign)) {
- tvc = afs_LookupVCache(&tfid, &treq, &cached, adp, tname);
+ tvc = afs_LookupVCache(&tfid, treq, &cached, adp, tname);
}
if (!tvc && !bulkcode) { /* lookup failed or wasn't called */
- tvc = afs_GetVCache(&tfid, &treq, &cached, NULL);
+ tvc = afs_GetVCache(&tfid, treq, &cached, NULL);
}
} /* if !tvc */
} /* sub-block just to reduce stack usage */
ObtainSharedLock(&tvc->lock, 680);
if (!tvc->linkData) {
UpgradeSToWLock(&tvc->lock, 681);
- code = afs_HandleLink(tvc, &treq);
+ code = afs_HandleLink(tvc, treq);
ConvertWToRLock(&tvc->lock);
} else {
ConvertSToRLock(&tvc->lock);
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) && defined(AFS_WEB_ENHANCEMENTS)
+#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;
ObtainWriteLock(&tvc->lock, 133);
- code = EvalMountPoint(tvc, adp, &tvolp, &treq);
+ code = EvalMountPoint(tvc, adp, &tvolp, treq);
ReleaseWriteLock(&tvc->lock);
if (code) {
if (tvolp && (tvolp->states & VForeign)) {
/* XXXX tvolp has ref cnt on but not locked! XXX */
tvc =
- afs_GetRootVCache(tvc->mvid, &treq, NULL, tvolp);
+ afs_GetRootVCache(tvc->mvid, treq, NULL, tvolp);
} else {
- tvc = afs_GetVCache(tvc->mvid, &treq, NULL, NULL);
+ tvc = afs_GetVCache(tvc->mvid, treq, NULL, NULL);
}
afs_PutVCache(uvc); /* we're done with it */
if (tvolp) {
ObtainWriteLock(&tvc->lock, 134);
if (tvc->mvid == NULL) {
- tvc->mvid = (struct VenusFid *)
+ tvc->mvid =
osi_AllocSmallSpace(sizeof(struct VenusFid));
}
/* setup backpointer */
if (!AFS_IS_DISCONNECTED) {
if (pass == 0) {
struct volume *tv;
- tv = afs_GetVolume(&adp->f.fid, &treq, READ_LOCK);
+ tv = afs_GetVolume(&adp->f.fid, treq, READ_LOCK);
if (tv) {
if (tv->states & VRO) {
pass = 1; /* try this *once* */
if (afs_mariner)
afs_AddMarinerName(aname, tvc);
-#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
+#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 && force_eval) {
+#endif /* UKERNEL */
+ if (!hit && (force_eval || tvc->mvstat != 1)) {
osi_dnlc_enter(adp, aname, tvc, &versionNo);
} else {
#ifdef AFS_LINUX20_ENV
/* So Linux inode cache is up to date. */
- code = afs_VerifyVCache(tvc, &treq);
+ code = afs_VerifyVCache(tvc, treq);
#else
afs_PutFakeStat(&fakestate);
+ afs_DestroyReq(treq);
AFS_DISCON_UNLOCK();
return 0; /* can't have been any errors if hit and !code */
#endif
}
-#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
+#if defined(UKERNEL)
}
#endif
}
if (bulkcode)
code = bulkcode;
- 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_DestroyReq(treq);
AFS_DISCON_UNLOCK();
return code;
}