d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename cache_lookup_times() to cache_lookup() and retire the old API and

Browse Source 
ABI stub for cache_lookup().
This commit is contained in:
John Baldwin 2012-02-06 17:00:28 +00:00
parent 000d6ce285
commit bf40d24a3f
6 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/nfsclient/nfs_clvnops.c
View File

@ -1042,7 +1042,7 @@ nfs_lookup(struct vop_lookup_args *ap)
if ((error = VOP_ACCESS(dvp, VEXEC, cnp->cn_cred, td)) != 0)
return (error);
error = cache_lookup_times(dvp, vpp, cnp, &nctime, &ncticks);
error = cache_lookup(dvp, vpp, cnp, &nctime, &ncticks);
if (error > 0 && error != ENOENT)
return (error);
if (error == -1) {

2
sys/fs/nwfs/nwfs_vnops.c
View File

@ -853,7 +853,7 @@ printf("dvp %d:%d:%d\n", (int)mp, (int)dvp->v_vflag & VV_ROOT, (int)flags & ISDO
if (error)
return ENOENT;
error = cache_lookup(dvp, vpp, cnp);
error = cache_lookup(dvp, vpp, cnp, NULL, NULL);
NCPVNDEBUG("cache_lookup returned %d\n", error);
if (error > 0)
return error;

2
sys/fs/smbfs/smbfs_vnops.c
View File

@ -1131,7 +1131,7 @@ smbfs_lookup(ap)
if (error)
return ENOENT;
error = cache_lookup(dvp, vpp, cnp);
error = cache_lookup(dvp, vpp, cnp, NULL, NULL);
SMBVDEBUG("cache_lookup returned %d\n", error);
if (error > 0)
return error;

14
sys/kern/vfs_cache.c
View File

@ -456,7 +456,7 @@ cache_zap(ncp)
*/
int
cache_lookup_times(dvp, vpp, cnp, tsp, ticksp)
cache_lookup(dvp, vpp, cnp, tsp, ticksp)
struct vnode *dvp;
struct vnode **vpp;
struct componentname *cnp;
@ -994,7 +994,7 @@ vfs_cache_lookup(ap)
if (error)
return (error);
error = cache_lookup(dvp, vpp, cnp);
error = cache_lookup(dvp, vpp, cnp, NULL, NULL);
if (error == 0)
return (VOP_CACHEDLOOKUP(dvp, vpp, cnp));
if (error == -1)
@ -1374,12 +1374,9 @@ vn_commname(struct vnode *vp, char *buf, u_int buflen)
/* ABI compat shims for old kernel modules. */
#undef cache_enter
#undef cache_lookup
void cache_enter(struct vnode *dvp, struct vnode *vp,
struct componentname *cnp);
int cache_lookup(struct vnode *dvp, struct vnode **vpp,
struct componentname *cnp);
void
cache_enter(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
@ -1388,13 +1385,6 @@ cache_enter(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
cache_enter_time(dvp, vp, cnp, NULL);
}
int
cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
{
return (cache_lookup_times(dvp, vpp, cnp, NULL, NULL));
}
/*
* This function updates path string to vnode's full global path
* and checks the size of the new path string against the pathlen argument.

2
sys/nfsclient/nfs_vnops.c
View File

@ -938,7 +938,7 @@ nfs_lookup(struct vop_lookup_args *ap)
*vpp = NULLVP;
return (error);
}
error = cache_lookup_times(dvp, vpp, cnp, &nctime, &ncticks);
error = cache_lookup(dvp, vpp, cnp, &nctime, &ncticks);
if (error > 0 && error != ENOENT)
return (error);
if (error == -1) {

4
sys/sys/vnode.h
View File

@ -586,9 +586,7 @@ struct vnode;
cache_enter_time(dvp, vp, cnp, NULL)
void cache_enter_time(struct vnode *dvp, struct vnode *vp,
struct componentname *cnp, struct timespec *tsp);
#define cache_lookup(dvp, vpp, cnp) \
cache_lookup_times(dvp, vpp, cnp, NULL, NULL)
int cache_lookup_times(struct vnode *dvp, struct vnode **vpp,
int cache_lookup(struct vnode *dvp, struct vnode **vpp,
struct componentname *cnp, struct timespec *tsp, int *ticksp);
void cache_purge(struct vnode *vp);
void cache_purge_negative(struct vnode *vp);