Author: jhb
Date: Mon Feb 6 17:00:28 2012
New Revision: 231088
URL: http://svn.freebsd.org/changeset/base/231088
Log:
Rename cache_lookup_times() to cache_lookup() and retire the old API and
ABI stub for cache_lookup().
Modified:
head/sys/fs/nfsclient/nfs_clvnops.c
head/sys/fs/nwfs/nwfs_vnops.c
head/sys/fs/smbfs/smbfs_vnops.c
head/sys/kern/vfs_cache.c
head/sys/nfsclient/nfs_vnops.c
head/sys/sys/vnode.h
Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c Mon Feb 6 14:11:24 2012
(r231087)
+++ head/sys/fs/nfsclient/nfs_clvnops.c Mon Feb 6 17:00:28 2012
(r231088)
@@ -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) {
Modified: head/sys/fs/nwfs/nwfs_vnops.c
==============================================================================
--- head/sys/fs/nwfs/nwfs_vnops.c Mon Feb 6 14:11:24 2012
(r231087)
+++ head/sys/fs/nwfs/nwfs_vnops.c Mon Feb 6 17:00:28 2012
(r231088)
@@ -853,7 +853,7 @@ printf("dvp %d:%d:%d\n", (int)mp, (int)d
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;
Modified: head/sys/fs/smbfs/smbfs_vnops.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_vnops.c Mon Feb 6 14:11:24 2012
(r231087)
+++ head/sys/fs/smbfs/smbfs_vnops.c Mon Feb 6 17:00:28 2012
(r231088)
@@ -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;
Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c Mon Feb 6 14:11:24 2012 (r231087)
+++ head/sys/kern/vfs_cache.c Mon Feb 6 17:00:28 2012 (r231088)
@@ -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,
/* 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 vn
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.
Modified: head/sys/nfsclient/nfs_vnops.c
==============================================================================
--- head/sys/nfsclient/nfs_vnops.c Mon Feb 6 14:11:24 2012
(r231087)
+++ head/sys/nfsclient/nfs_vnops.c Mon Feb 6 17:00:28 2012
(r231088)
@@ -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) {
Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h Mon Feb 6 14:11:24 2012 (r231087)
+++ head/sys/sys/vnode.h Mon Feb 6 17:00:28 2012 (r231088)
@@ -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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
