diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-09-09 10:37:05 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-09-09 10:37:05 +0000 |
| commit | 970787f7373758663abfd863435f27ac03b51fb4 (patch) | |
| tree | 81157216550a9d8ea8b4eee919fc1922fd3e82ba /sys/nfs | |
| parent | f11c329e7caff0cc9d3a1aa49dc295963a9e2793 (diff) | |
Rename lookup/relookup to vfs_lookup/vfs_relookup.
OK oga@, beck@, matthew@
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 8 | ||||
| -rw-r--r-- | sys/nfs/nfs_subs.c | 4 |
2 files changed, 6 insertions, 6 deletions
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; /* |