diff options
| author | jeff <jeff@FreeBSD.org> | 2005-03-24 06:03:31 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2005-03-24 06:03:31 +0000 |
| commit | b84afc39aafb16dc62e5ac1bdacf3b7a418c90c9 (patch) | |
| tree | 0a17d336d3a29d77507fec99b71e298b887ca96d | |
| parent | 9b04831cbb8333e22d84893b3cd728a3cda5809b (diff) | |
| download | FreeBSD-src-b84afc39aafb16dc62e5ac1bdacf3b7a418c90c9.zip FreeBSD-src-b84afc39aafb16dc62e5ac1bdacf3b7a418c90c9.tar.gz | |
- Remove the #ifdef LOOKUP_SHARED from some calls to NDINIT. The
LOCKSHARED flag is simply ignored in namei() if LOOKUP_SHARED is not
enabled.
Sponsored by: Isilon Systems, Inc.
| -rw-r--r-- | sys/kern/vfs_extattr.c | 8 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index b949bc7..162f169 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -2052,13 +2052,8 @@ kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) struct stat sb; int error, vfslocked; -#ifdef LOOKUP_SHARED NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | NOOBJ | MPSAFE, pathseg, path, td); -#else - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ | MPSAFE, pathseg, path, - td); -#endif if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2106,8 +2101,7 @@ kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp struct nameidata nd; int error, vfslocked; - /* XXX LOOKUP_SHARED? */ - NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | NOOBJ | MPSAFE, + NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | NOOBJ | MPSAFE, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index b949bc7..162f169 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -2052,13 +2052,8 @@ kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) struct stat sb; int error, vfslocked; -#ifdef LOOKUP_SHARED NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | NOOBJ | MPSAFE, pathseg, path, td); -#else - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ | MPSAFE, pathseg, path, - td); -#endif if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2106,8 +2101,7 @@ kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp struct nameidata nd; int error, vfslocked; - /* XXX LOOKUP_SHARED? */ - NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | NOOBJ | MPSAFE, + NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | NOOBJ | MPSAFE, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); |
