jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-22 08:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor internal cleanup of fakestat's afs_EvalFakeStat and

Browse Source 
afs_TryEvalFakeStat; no functional change.
This commit is contained in:
Nickolai Zeldovich 2002-07-20 08:57:17 +00:00
parent 4fac7a61d8
commit e2fcfb88a2
2 changed files with 91 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/afs/VNOPS/afs_vnop_lookup.c
View File

@ -255,7 +255,95 @@ afs_InitFakeStat(state)
state->valid = 1;
state->did_eval = 0;
state->need_release = 0;
state->nonblock = 0;
}
/*
* afs_EvalFakeStat_int
*
* The actual implementation of afs_EvalFakeStat and afs_TryEvalFakeStat,
* which is called by those wrapper functions.
*
* Only issues RPCs if canblock is non-zero.
*/
static int
afs_EvalFakeStat_int(avcp, state, areq, canblock)
struct vcache **avcp;
struct afs_fakestat_state *state;
struct vrequest *areq;
int canblock;
{
struct vcache *tvc, *root_vp;
struct volume *tvolp = NULL;
int code = 0;
osi_Assert(state->valid == 1);
osi_Assert(state->did_eval == 0);
state->did_eval = 1;
if (!afs_fakestat_enable)
return 0;
tvc = *avcp;
if (tvc->mvstat != 1)
return 0;
/* Is the call to VerifyVCache really necessary? */
code = afs_VerifyVCache(tvc, areq);
if (code)
goto done;
if (canblock) {
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;
}
}
if (tvc->mvid && (tvc->states & CMValid)) {
if (!canblock) {
afs_int32 retry;
do {
retry = 0;
ObtainWriteLock(&afs_xvcache, 597);
root_vp = afs_FindVCache(tvc->mvid, 0, 0, &retry, 0);
if (root_vp && retry) {
ReleaseWriteLock(&afs_xvcache);
afs_PutVCache(root_vp, 0);
}
} while (root_vp && retry);
ReleaseWriteLock(&afs_xvcache);
} else {
root_vp = afs_GetVCache(tvc->mvid, areq, NULL, NULL, WRITE_LOCK);
}
if (!root_vp) {
code = canblock ? ENOENT : 0;
goto done;
}
if (tvolp) {
/* Is this always kosher? Perhaps we should instead use
* NBObtainWriteLock to avoid potential deadlock.
*/
ObtainWriteLock(&root_vp->lock, 598);
if (!root_vp->mvid)
root_vp->mvid = osi_AllocSmallSpace(sizeof(struct VenusFid));
*root_vp->mvid = tvolp->dotdot;
ReleaseWriteLock(&root_vp->lock);
}
state->need_release = 1;
state->root_vp = root_vp;
*avcp = root_vp;
code = 0;
} else {
code = canblock ? ENOENT : 0;
}
done:
if (tvolp)
afs_PutVolume(tvolp, WRITE_LOCK);
return code;
}
/*
@ -277,78 +365,7 @@ afs_EvalFakeStat(avcp, state, areq)
struct afs_fakestat_state *state;
struct vrequest *areq;
{
struct vcache *tvc, *root_vp;
struct volume *tvolp = NULL;
int code = 0;
osi_Assert(state->valid == 1);
osi_Assert(state->did_eval == 0);
state->did_eval = 1;
if (!afs_fakestat_enable)
return 0;
tvc = *avcp;
if (tvc->mvstat != 1)
return 0;
/* Is the call to VerifyVCache really necessary? */
code = afs_VerifyVCache(tvc, areq);
if (code)
goto done;
if (!state->nonblock) {
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;
}
}
if (tvc->mvid && (tvc->states & CMValid)) {
if (state->nonblock) {
afs_int32 retry;
do {
retry = 0;
ObtainWriteLock(&afs_xvcache, 597);
root_vp = afs_FindVCache(tvc->mvid, 0, 0, &retry, 0);
if (root_vp && retry) {
ReleaseWriteLock(&afs_xvcache);
afs_PutVCache(root_vp, 0);
}
} while (root_vp && retry);
ReleaseWriteLock(&afs_xvcache);
} else {
root_vp = afs_GetVCache(tvc->mvid, areq, NULL, NULL, WRITE_LOCK);
}
if (!root_vp) {
code = state->nonblock ? 0 : ENOENT;
goto done;
}
if (tvolp) {
/* Is this always kosher? Perhaps we should instead use
* NBObtainWriteLock to avoid potential deadlock.
*/
ObtainWriteLock(&root_vp->lock, 598);
if (!root_vp->mvid)
root_vp->mvid = osi_AllocSmallSpace(sizeof(struct VenusFid));
*root_vp->mvid = tvolp->dotdot;
ReleaseWriteLock(&root_vp->lock);
}
state->need_release = 1;
state->root_vp = root_vp;
*avcp = root_vp;
code = 0;
} else {
code = state->nonblock ? 0 : ENOENT;
}
done:
if (tvolp)
afs_PutVolume(tvolp, WRITE_LOCK);
return code;
return afs_EvalFakeStat_int(avcp, state, areq, 1);
}
/*
@ -367,8 +384,7 @@ afs_TryEvalFakeStat(avcp, state, areq)
struct afs_fakestat_state *state;
struct vrequest *areq;
{
state->nonblock = 1;
return afs_EvalFakeStat(avcp, state, areq);
return afs_EvalFakeStat_int(avcp, state, areq, 0);
}
/*

1
src/afs/afs.h
View File

@ -1188,7 +1188,6 @@ struct afs_fakestat_state {
char valid;
char did_eval;
char need_release;
char nonblock;
struct vcache *root_vp;
};