jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

afs: refactor PNewStatMount and PFlushMount

Browse Source 
Both functions use the same logic to find a name in a given directory.
To avoid repetition, move this logic to a separate function called
afs_LookupName().

No functional change is incurred by this commit.

Change-Id: Ic5da09091e7050dd5f91adc7a413328edfb8292d
Reviewed-on: https://gerrit.openafs.org/14541
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Marcio Barbosa 2021-08-17 19:52:11 +00:00 committed by Benjamin Kaduk
parent 71acc392a3
commit 981bc005f8
1 changed files with 79 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/afs/afs_pioctl.c
View File

@ -2187,6 +2187,73 @@ DECL_PIOCTL(PFlush)
return 0;
}
/*!
* Lookup name in the directory associated with given vcache.
*
* \param[in] avc vcache associated with directory
* \param[in] areq request to be passed on
* \param[in] aname name to be searched
* \param[out] asys resolved name (replace @sys by system type)
* \param[out] afid fid associated with aname
*
* \return 0 on success; non-zero otherwise.
*
* \notes The caller must free asys->name (checking if asys->allocked == 1).
*/
static int
afs_LookupName(struct vcache *avc, struct vrequest *areq, char *aname,
struct sysname_info *asys, struct VenusFid *afid)
{
int code;
struct dcache *tdc;
afs_size_t offset, len;
memset(asys, 0, sizeof(*asys));
memset(afid, 0, sizeof(*afid));
if (!avc || !areq || !aname || !asys || !afid) {
afs_warn("afs: Internal error, bad args to afs_LookupName: %p, %p, %p, "
"%p, %p.\n", avc, areq, aname, asys, afid);
code = EIO;
goto done;
}
/* check if vcache is up to date */
code = afs_VerifyVCache(avc, areq);
if (code != 0) {
goto done;
}
/* must be a directory */
if (vType(avc) != VDIR) {
code = ENOTDIR;
goto done;
}
tdc = afs_GetDCache(avc, 0, areq, &offset, &len, 1);
if (!tdc) {
code = EIO;
goto done;
}
/* if @sys is present, replace it by the machine's system type */
Check_AtSys(avc, aname, asys, areq);
ObtainReadLock(&tdc->lock);
do {
/*
* Lookup name in the appropriate directory. If name is not found, try
* again with the next sysname from the @sys list.
*/
code = afs_dir_Lookup(tdc, asys->name, &afid->Fid);
} while (code == ENOENT && Next_AtSys(avc, areq, asys));
ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc);
done:
return code;
}
/*!
* VIOC_AFS_STAT_MT_PT (29) - Stat mount point
*
@ -2208,40 +2275,26 @@ DECL_PIOCTL(PNewStatMount)
{
afs_int32 code;
struct vcache *tvc;
struct dcache *tdc;
struct VenusFid tfid;
char *bufp;
char *name;
struct sysname_info sysState;
afs_size_t offset, len;
AFS_STATCNT(PNewStatMount);
memset(&sysState, 0, sizeof(sysState));
if (!avc)
return EINVAL;
if (afs_pd_getStringPtr(ain, &name) != 0)
return EINVAL;
code = afs_VerifyVCache(avc, areq);
if (code)
return code;
if (vType(avc) != VDIR) {
return ENOTDIR;
}
tdc = afs_GetDCache(avc, (afs_size_t) 0, areq, &offset, &len, 1);
if (!tdc)
return EIO;
Check_AtSys(avc, name, &sysState, areq);
ObtainReadLock(&tdc->lock);
do {
code = afs_dir_Lookup(tdc, sysState.name, &tfid.Fid);
} while (code == ENOENT && Next_AtSys(avc, areq, &sysState));
ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc); /* we're done with the data */
bufp = sysState.name;
code = afs_LookupName(avc, areq, name, &sysState, &tfid);
if (code) {
goto out;
}
bufp = sysState.name;
tfid.Cell = avc->f.fid.Cell;
tfid.Fid.Volume = avc->f.fid.Fid.Volume;
if (!tfid.Fid.Unique && (avc->f.states & CForeign)) {
@ -2276,7 +2329,7 @@ DECL_PIOCTL(PNewStatMount)
afs_PutVCache(tvc);
out:
if (sysState.allocked)
osi_FreeLargeSpace(bufp);
osi_FreeLargeSpace(sysState.name);
return code;
}
@ -4824,40 +4877,26 @@ DECL_PIOCTL(PFlushMount)
{
afs_int32 code;
struct vcache *tvc;
struct dcache *tdc;
struct VenusFid tfid;
char *bufp;
char *mount;
struct sysname_info sysState;
afs_size_t offset, len;
AFS_STATCNT(PFlushMount);
memset(&sysState, 0, sizeof(sysState));
if (!avc)
return EINVAL;
if (afs_pd_getStringPtr(ain, &mount) != 0)
return EINVAL;
code = afs_VerifyVCache(avc, areq);
if (code)
return code;
if (vType(avc) != VDIR) {
return ENOTDIR;
}
tdc = afs_GetDCache(avc, (afs_size_t) 0, areq, &offset, &len, 1);
if (!tdc)
return EIO;
Check_AtSys(avc, mount, &sysState, areq);
ObtainReadLock(&tdc->lock);
do {
code = afs_dir_Lookup(tdc, sysState.name, &tfid.Fid);
} while (code == ENOENT && Next_AtSys(avc, areq, &sysState));
ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc); /* we're done with the data */
bufp = sysState.name;
code = afs_LookupName(avc, areq, mount, &sysState, &tfid);
if (code) {
goto out;
}
bufp = sysState.name;
tfid.Cell = avc->f.fid.Cell;
tfid.Fid.Volume = avc->f.fid.Fid.Volume;
if (!tfid.Fid.Unique && (avc->f.states & CForeign)) {
@ -4887,7 +4926,7 @@ DECL_PIOCTL(PFlushMount)
afs_PutVCache(tvc);
out:
if (sysState.allocked)
osi_FreeLargeSpace(bufp);
osi_FreeLargeSpace(sysState.name);
return code;
}