summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/kern/vfs_lookup.c8
-rw-r--r--sys/msdosfs/msdosfs_vnops.c6
-rw-r--r--sys/nfs/nfs_serv.c8
-rw-r--r--sys/nfs/nfs_subs.c4
-rw-r--r--sys/sys/namei.h6
-rw-r--r--sys/ufs/ext2fs/ext2fs_vnops.c8
-rw-r--r--sys/ufs/ufs/ufs_vnops.c8
7 files changed, 24 insertions, 24 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index e6a351d3c04..db7ab3bc7d9 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_lookup.c,v 1.42 2010/05/20 02:32:02 marco Exp $ */
+/* $OpenBSD: vfs_lookup.c,v 1.43 2010/09/09 10:37:03 thib Exp $ */
/* $NetBSD: vfs_lookup.c,v 1.17 1996/02/09 19:00:59 christos Exp $ */
/*
@@ -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 */
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 571d8695bd1..011efd4a1b2 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vnops.c,v 1.73 2010/09/06 23:44:10 thib Exp $ */
+/* $OpenBSD: msdosfs_vnops.c,v 1.74 2010/09/09 10:37:04 thib Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */
/*-
@@ -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.
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 059b1a1852d..0472ab8adfe 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_serv.c,v 1.90 2010/03/29 23:33:39 krw Exp $ */
+/* $OpenBSD: nfs_serv.c,v 1.91 2010/09/09 10:37:04 thib Exp $ */
/* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */
/*
@@ -997,7 +997,7 @@ nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
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, struct nfssvc_sock *slp,
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 *nfsd, struct nfssvc_sock *slp,
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;
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index b28f1caa2e1..17660b65fae 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_subs.c,v 1.109 2010/09/06 23:44:10 thib Exp $ */
+/* $OpenBSD: nfs_subs.c,v 1.110 2010/09/09 10:37:04 thib Exp $ */
/* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */
/*
@@ -1252,7 +1252,7 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
* And call lookup() to do the real work
*/
cnp->cn_proc = p;
- error = lookup(ndp);
+ error = vfs_lookup(ndp);
if (error)
goto out;
/*
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 96f933375fa..ee8c624ccd4 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: namei.h,v 1.24 2010/05/19 08:31:23 thib Exp $ */
+/* $OpenBSD: namei.h,v 1.25 2010/09/09 10:37:04 thib Exp $ */
/* $NetBSD: namei.h,v 1.11 1996/02/09 18:25:20 christos Exp $ */
/*
@@ -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 *);
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c
index e3653f07e25..0bc63b51edd 100644
--- a/sys/ufs/ext2fs/ext2fs_vnops.c
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vnops.c,v 1.54 2010/09/06 23:44:10 thib Exp $ */
+/* $OpenBSD: ext2fs_vnops.c,v 1.55 2010/09/09 10:37:04 thib Exp $ */
/* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */
/*
@@ -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);
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index db815995baa..71b172273e1 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.93 2010/09/06 23:44:11 thib Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.94 2010/09/09 10:37:04 thib Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:39:08 +0000