diff options
| -rw-r--r-- | share/man/man9/namei.9 | 8 | ||||
| -rw-r--r-- | sys/kern/vfs_lookup.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index 5542016209e..a8940fff23d 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: namei.9,v 1.11 2005/06/15 17:51:35 millert Exp $ +.\" $OpenBSD: namei.9,v 1.12 2006/06/23 22:20:39 sturm Exp $ .\" $NetBSD: namei.9,v 1.9 2003/05/06 10:46:44 jmmv Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -192,7 +192,7 @@ Pathname lookups cannot be done in interrupt context. .Sh FUNCTIONS .Bl -tag -width compact .It Fn namei "ndp" -Convert a pathname into a pointer to a locked inode. +Convert a pathname into a pointer to a vnode. The pathname is specified by .Em ndp-\*[Gt]ni_dirp and is of length @@ -203,7 +203,7 @@ flags defines whether the name in .Em ndp-\*[Gt]ni_dirp is an address in kernel space (UIO_SYSSPACE) or an address in user space (UIO_USERSPACE). -The locked vnode for the pathname is referenced and returned in +The vnode for the pathname is referenced and returned in .Em ndp-\*[Gt]ni_vp . .Pp If @@ -212,6 +212,8 @@ has the FOLLOW flag set then symbolic links are followed when they occur at the end of the name translation process. Symbolic links are always followed for all other pathname components other than the last. +.Pp +If the LOCKLEAF flag is set, a locked vnode is returned. .It Fn lookup "ndp" Search for a pathname. This is a very central and rather complicated routine. diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 9fa13cc7c93..eb26ef1c7a6 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_lookup.c,v 1.33 2006/06/14 20:01:50 sturm Exp $ */ +/* $OpenBSD: vfs_lookup.c,v 1.34 2006/06/23 22:20:39 sturm Exp $ */ /* $NetBSD: vfs_lookup.c,v 1.17 1996/02/09 19:00:59 christos Exp $ */ /* @@ -59,13 +59,15 @@ #include "systrace.h" /* - * Convert a pathname into a pointer to a locked inode. + * Convert a pathname into a pointer to a vnode. * * The FOLLOW flag is set when symbolic links are to be followed * when they occur at the end of the name translation process. * Symbolic links are always followed for all other pathname * components other than the last. * + * If the LOCKLEAF flag is set, a locked vnode is returned. + * * The segflg defines whether the name is to be copied from user * space or kernel space. * |