diff options
author | Artur Grabowski <art@cvs.openbsd.org> | 2001-05-14 14:55:49 +0000 |
---|---|---|
committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-05-14 14:55:49 +0000 |
commit | 9e87fffca854f92807879b7e400c422f9c1650af (patch) | |
tree | b6ebdb1cf743170d6acdae3a5b0b61eae551fc20 | |
parent | 16a8bb514f79dc35c655d1d8dde7ce132079e14c (diff) |
Remove some unnecessary code + some random cleanup.
-rw-r--r-- | sys/kern/vfs_syscalls.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 8f07631a6f6..85ca4dd8c52 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.71 2001/05/13 02:40:46 millert Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.72 2001/05/14 14:55:48 art Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -861,24 +861,23 @@ sys_open(p, v, retval) void *v; register_t *retval; { - register struct sys_open_args /* { + struct sys_open_args /* { syscallarg(char *) path; syscallarg(int) flags; syscallarg(int) mode; } */ *uap = v; - register struct filedesc *fdp = p->p_fd; - register struct file *fp; - register struct vnode *vp; + struct filedesc *fdp = p->p_fd; + struct file *fp; + struct vnode *vp; struct vattr vattr; int flags, cmode; - struct file *nfp; int type, indx, error, localtrunc = 0; struct flock lf; struct nameidata nd; - if ((error = falloc(p, &nfp, &indx)) != 0) + if ((error = falloc(p, &fp, &indx)) != 0) return (error); - fp = nfp; + flags = FFLAGS(SCARG(uap, flags)); cmode = ((SCARG(uap, mode) &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, SCARG(uap, path), p); |