diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index e2e09b956723..c842c1916149 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -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) { diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c index ddbdc169ec02..b3f26e8e042e 100644 --- a/sys/fs/nwfs/nwfs_vnops.c +++ b/sys/fs/nwfs/nwfs_vnops.c @@ -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; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index a236ca764962..99cbec5de63a 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -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; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 4562ebc0888d..81ad44e0a3ab 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -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. diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 5cdf2dd5f155..241af51410a8 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -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) { diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 1b58c5724dff..4747d7b899b6 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -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);