*/
static int
EvalMountData(char type, char *data, afs_uint32 states, afs_uint32 cellnum,
- struct volume **avolpp, register struct vrequest *areq,
+ struct volume **avolpp, struct vrequest *areq,
afs_uint32 *acellidxp, afs_uint32 *avolnump,
afs_uint32 *avnoidp, afs_uint32 *auniqp)
{
}
int
-EvalMountPoint(register struct vcache *avc, struct vcache *advc,
- struct volume **avolpp, register struct vrequest *areq)
+EvalMountPoint(struct vcache *avc, struct vcache *advc,
+ struct volume **avolpp, struct vrequest *areq)
{
afs_int32 code;
afs_uint32 avnoid, auniq;
}
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);
}
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;
}
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;
tcp = afs_Conn(&adp->f.fid, areqp, SHARED_LOCK);
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)) {
+ retryonce:
+ RX_AFS_GUNLOCK();
code =
RXAFS_InlineBulkStatus(tcp->id, &fidParm, &statParm,
&cbParm, &volSync);
+ RX_AFS_GLOCK();
if (code == RXGEN_OPCODE) {
- tcp->srvr->server->flags |= SNO_INLINEBULK;
+ tcp->parent->srvr->server->flags |= SNO_INLINEBULK;
inlinebulk = 0;
+ RX_AFS_GUNLOCK();
code =
RXAFS_BulkStatus(tcp->id, &fidParm, &statParm,
&cbParm, &volSync);
- } else
+ 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,
&volSync);
+ RX_AFS_GLOCK();
}
- RX_AFS_GLOCK();
XSTATS_END_TIME;
} else
code = -1;
/* was: (AFS_DEC_ENV) || defined(AFS_OSF30_ENV) || defined(AFS_NCR_ENV) */
static int AFSDOBULK = 1;
+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
#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)
{
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;
* 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);
if (tvc) {
if (no_read_access && vType(tvc) != VDIR && vType(tvc) != VLNK) {
/* need read access on dir to stat non-directory / non-link */
-#ifndef AFS_FBSD80_ENV
afs_PutVCache(tvc);
-#endif
*avcp = NULL;
code = EACCES;
goto done;
}
{ /* sub-block just to reduce stack usage */
- register struct dcache *tdc;
+ struct dcache *tdc;
afs_size_t dirOffset, dirLen;
struct VenusFid tfid;
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);
/* if the vcache isn't usable, release it */
if (tvc && !(tvc->f.states & CStatd)) {
-#ifndef AFS_FBSD80_ENV
afs_PutVCache(tvc);
-#endif
tvc = NULL;
}
} else {
ReleaseWriteLock(&tvc->lock);
if (code) {
-#ifndef AFS_FBSD80_ENV
afs_PutVCache(tvc);
-#endif
if (tvolp)
afs_PutVolume(tvolp, WRITE_LOCK);
goto done;
} else {
tvc = afs_GetVCache(tvc->mvid, &treq, NULL, NULL);
}
-#ifndef AFS_FBSD80_ENV
afs_PutVCache(uvc); /* we're done with it */
-#endif
if (!tvc) {
code = ENOENT;
afs_PutVolume(tvolp, WRITE_LOCK);
}
} else {
-#ifndef AFS_FBSD80_ENV
afs_PutVCache(tvc);
-#endif
code = ENOENT;
if (tvolp)
afs_PutVolume(tvolp, WRITE_LOCK);
git://git.openafs.org / openafs.git / blobdiff