i've always been annoyed with the oh so very generic name
"lookup" for the vfs lookup routine, so rename it and the
relookup routine to vfs_lookup and vfs_relookup.
comments/oks?
Index: kern/vfs_lookup.c
===================================================================
RCS file: /home/cvs/src/sys/kern/vfs_lookup.c,v
retrieving revision 1.42
diff -u -p -r1.42 vfs_lookup.c
--- kern/vfs_lookup.c 20 May 2010 02:32:02 -0000 1.42
+++ kern/vfs_lookup.c 8 Sep 2010 21:30:43 -0000
@@ -179,7 +179,7 @@ namei(struct nameidata *ndp)
}
cnp->cn_nameptr = cnp->cn_pnbuf;
ndp->ni_startdir = dp;
- if ((error = lookup(ndp)) != 0) {
+ if ((error = vfs_lookup(ndp)) != 0) {
pool_put(&namei_pool, cnp->cn_pnbuf);
return (error);
}
@@ -293,7 +293,7 @@ badlink:
* if WANTPARENT set, return unlocked parent in ni_dvp
*/
int
-lookup(struct nameidata *ndp)
+vfs_lookup(struct nameidata *ndp)
{
char *cp; /* pointer into pathname argument */
struct vnode *dp = 0; /* the directory we are searching */
@@ -613,7 +613,7 @@ bad:
* Reacquire a path name component.
*/
int
-relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
+vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
{
struct proc *p = cnp->cn_proc;
struct vnode *dp = 0; /* the directory we are searching */
Index: msdosfs/msdosfs_vnops.c
===================================================================
RCS file: /home/cvs/src/sys/msdosfs/msdosfs_vnops.c,v
retrieving revision 1.73
diff -u -p -r1.73 msdosfs_vnops.c
--- msdosfs/msdosfs_vnops.c 6 Sep 2010 23:44:10 -0000 1.73
+++ msdosfs/msdosfs_vnops.c 8 Sep 2010 21:36:24 -0000
@@ -957,7 +957,7 @@ abortit:
goto out;
if ((tcnp->cn_flags & SAVESTART) == 0)
panic("msdosfs_rename: lost to startdir");
- if ((error = relookup(tdvp, &tvp, tcnp)) != 0)
+ if ((error = vfs_relookup(tdvp, &tvp, tcnp)) != 0)
goto out;
dp = VTODE(tdvp);
xp = tvp ? VTODE(tvp) : NULL;
@@ -1007,7 +1007,7 @@ abortit:
panic("msdosfs_rename: lost from startdir");
if (!newparent)
VOP_UNLOCK(tdvp, 0, p);
- (void) relookup(fdvp, &fvp, fcnp);
+ (void) vfs_relookup(fdvp, &fvp, fcnp);
if (fvp == NULL) {
/*
* From name has disappeared.
Index: nfs/nfs_serv.c
===================================================================
RCS file: /home/cvs/src/sys/nfs/nfs_serv.c,v
retrieving revision 1.90
diff -u -p -r1.90 nfs_serv.c
--- nfs/nfs_serv.c 29 Mar 2010 23:33:39 -0000 1.90
+++ nfs/nfs_serv.c 8 Sep 2010 21:31:30 -0000
@@ -997,7 +997,7 @@ nfsrv_create(struct nfsrv_descript *nfsd
nd.ni_cnd.cn_flags &= ~(LOCKPARENT | SAVESTART);
nd.ni_cnd.cn_proc = procp;
nd.ni_cnd.cn_cred = cred;
- if ((error = lookup(&nd)) != 0) {
+ if ((error = vfs_lookup(&nd)) != 0) {
pool_put(&namei_pool, nd.ni_cnd.cn_pnbuf);
nfsm_reply(0);
error = 0;
@@ -1194,7 +1194,7 @@ nfsrv_mknod(struct nfsrv_descript *nfsd,
nd.ni_cnd.cn_flags &= ~(LOCKPARENT | SAVESTART);
nd.ni_cnd.cn_proc = procp;
nd.ni_cnd.cn_cred = procp->p_ucred;
- error = lookup(&nd);
+ error = vfs_lookup(&nd);
pool_put(&namei_pool, nd.ni_cnd.cn_pnbuf);
if (error)
goto out;
@@ -1712,7 +1712,7 @@ nfsrv_symlink(struct nfsrv_descript *nfs
nd.ni_cnd.cn_flags |= (NOFOLLOW | LOCKLEAF);
nd.ni_cnd.cn_proc = procp;
nd.ni_cnd.cn_cred = cred;
- error = lookup(&nd);
+ error = vfs_lookup(&nd);
if (!error) {
bzero((caddr_t)fhp, sizeof(nfh));
fhp->fh_fsid = nd.ni_vp->v_mount->mnt_stat.f_fsid;
Index: nfs/nfs_subs.c
===================================================================
RCS file: /home/cvs/src/sys/nfs/nfs_subs.c,v
retrieving revision 1.109
diff -u -p -r1.109 nfs_subs.c
--- nfs/nfs_subs.c 6 Sep 2010 23:44:10 -0000 1.109
+++ nfs/nfs_subs.c 8 Sep 2010 21:40:04 -0000
@@ -1252,7 +1252,7 @@ nfs_namei(struct nameidata *ndp, fhandle
* And call lookup() to do the real work
*/
cnp->cn_proc = p;
- error = lookup(ndp);
+ error = vfs_lookup(ndp);
if (error)
goto out;
/*
Index: sys/namei.h
===================================================================
RCS file: /home/cvs/src/sys/sys/namei.h,v
retrieving revision 1.24
diff -u -p -r1.24 namei.h
--- sys/namei.h 19 May 2010 08:31:23 -0000 1.24
+++ sys/namei.h 8 Sep 2010 21:29:13 -0000
@@ -175,8 +175,8 @@ struct namecache {
#ifdef _KERNEL
int namei(struct nameidata *ndp);
-int lookup(struct nameidata *ndp);
-int relookup(struct vnode *dvp, struct vnode **vpp,
+int vfs_lookup(struct nameidata *ndp);
+int vfs_relookup(struct vnode *dvp, struct vnode **vpp,
struct componentname *cnp);
void cache_purge(struct vnode *);
int cache_lookup(struct vnode *, struct vnode **, struct componentname *);
Index: ufs/ext2fs/ext2fs_vnops.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ext2fs/ext2fs_vnops.c,v
retrieving revision 1.54
diff -u -p -r1.54 ext2fs_vnops.c
--- ufs/ext2fs/ext2fs_vnops.c 6 Sep 2010 23:44:10 -0000 1.54
+++ ufs/ext2fs/ext2fs_vnops.c 8 Sep 2010 21:36:43 -0000
@@ -570,7 +570,7 @@ abortit:
if ((fcnp->cn_flags & SAVESTART) == 0)
panic("ext2fs_rename: lost from startdir");
fcnp->cn_nameiop = DELETE;
- (void) relookup(fdvp, &fvp, fcnp);
+ (void) vfs_relookup(fdvp, &fvp, fcnp);
return (VOP_REMOVE(fdvp, fvp, fcnp));
}
if ((error = vn_lock(fvp, LK_EXCLUSIVE, p)) != 0)
@@ -662,7 +662,7 @@ abortit:
goto out;
if ((tcnp->cn_flags & SAVESTART) == 0)
panic("ext2fs_rename: lost to startdir");
- if ((error = relookup(tdvp, &tvp, tcnp)) != 0)
+ if ((error = vfs_relookup(tdvp, &tvp, tcnp)) != 0)
goto out;
dp = VTOI(tdvp);
xp = NULL;
@@ -787,7 +787,7 @@ abortit:
fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
if ((fcnp->cn_flags & SAVESTART) == 0)
panic("ext2fs_rename: lost from startdir");
- (void) relookup(fdvp, &fvp, fcnp);
+ (void) vfs_relookup(fdvp, &fvp, fcnp);
if (fvp != NULL) {
xp = VTOI(fvp);
dp = VTOI(fdvp);
Index: ufs/ufs/ufs_vnops.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ufs/ufs_vnops.c,v
retrieving revision 1.93
diff -u -p -r1.93 ufs_vnops.c
--- ufs/ufs/ufs_vnops.c 6 Sep 2010 23:44:11 -0000 1.93
+++ ufs/ufs/ufs_vnops.c 8 Sep 2010 21:37:06 -0000
@@ -748,7 +748,7 @@ abortit:
if ((fcnp->cn_flags & SAVESTART) == 0)
panic("ufs_rename: lost from startdir");
fcnp->cn_nameiop = DELETE;
- if ((error = relookup(fdvp, &fvp, fcnp)) != 0)
+ if ((error = vfs_relookup(fdvp, &fvp, fcnp)) != 0)
return (error); /* relookup did vrele() */
vrele(fdvp);
return (VOP_REMOVE(fdvp, fvp, fcnp));
@@ -855,7 +855,7 @@ abortit:
}
if ((tcnp->cn_flags & SAVESTART) == 0)
panic("ufs_rename: lost to startdir");
- if ((error = relookup(tdvp, &tvp, tcnp)) != 0)
+ if ((error = vfs_relookup(tdvp, &tvp, tcnp)) != 0)
goto out;
vrele(tdvp); /* relookup() acquired a reference */
dp = VTOI(tdvp);
@@ -1004,7 +1004,7 @@ abortit:
fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
if ((fcnp->cn_flags & SAVESTART) == 0)
panic("ufs_rename: lost from startdir");
- if ((error = relookup(fdvp, &fvp, fcnp)) != 0) {
+ if ((error = vfs_relookup(fdvp, &fvp, fcnp)) != 0) {
vrele(ap->a_fvp);
return (error);
}
