diff options
| author |   art <art@openbsd.org> | 2001-10-31 10:56:10 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2001-10-31 10:56:10 +0000 |
| commit | c9f94c9133568bc91a6977829c3922fc531ee4ee (patch) | |
| tree | 8529d99a130f62bddbb5072817f96af17495d84c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-c9f94c9133568bc91a6977829c3922fc531ee4ee.tar.xz wireguard-openbsd-c9f94c9133568bc91a6977829c3922fc531ee4ee.zip | |
There is no need to fake handling of /dev/zero here. The vm system ultrix/ultrix_misc.c sunos/sunos_misc.c
does this automagically (and has done it for ages).
| -rw-r--r-- | sys/compat/sunos/sunos_misc.c | 23 | ||||
| -rw-r--r-- | sys/compat/ultrix/ultrix_misc.c | 21 |
2 files changed, 6 insertions, 38 deletions
diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c index bf09360cb49..cb4a962dad5 100644 --- a/sys/compat/sunos/sunos_misc.c +++ b/sys/compat/sunos/sunos_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_misc.c,v 1.28 2001/10/26 12:03:27 art Exp $ */ +/* $OpenBSD: sunos_misc.c,v 1.29 2001/10/31 10:56:10 art Exp $ */ /* $NetBSD: sunos_misc.c,v 1.65 1996/04/22 01:44:31 christos Exp $ */ /* @@ -456,15 +456,12 @@ sunos_sys_getdents(p, v, retval) int sunos_sys_mmap(p, v, retval) - register struct proc *p; + struct proc *p; void *v; register_t *retval; { - register struct sunos_sys_mmap_args *uap = v; + struct sunos_sys_mmap_args *uap = v; struct sys_mmap_args ouap; - register struct filedesc *fdp; - register struct file *fp; - register struct vnode *vp; /* * Verify the arguments. @@ -488,20 +485,6 @@ sunos_sys_mmap(p, v, retval) SCARG(&ouap, fd) = SCARG(uap, fd); SCARG(&ouap, pos) = SCARG(uap, pos); - /* - * Special case: if fd refers to /dev/zero, map as MAP_ANON. (XXX) - * XXXART - this is probably completly unnecessary. mmap deals with - * XXXART - this just fine. - */ - fdp = p->p_fd; - if ((fp = fd_getfile(fdp, SCARG(&ouap, fd))) != NULL && /*XXX*/ - fp->f_type == DTYPE_VNODE && /*XXX*/ - (vp = (struct vnode *)fp->f_data)->v_type == VCHR && /*XXX*/ - iszerodev(vp->v_rdev)) { /*XXX*/ - SCARG(&ouap, flags) |= MAP_ANON; - SCARG(&ouap, fd) = -1; - } - return (sys_mmap(p, &ouap, retval)); } diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c index c17a4ffb185..f6885c3887b 100644 --- a/sys/compat/ultrix/ultrix_misc.c +++ b/sys/compat/ultrix/ultrix_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_misc.c,v 1.20 2001/10/26 12:03:27 art Exp $ */ +/* $OpenBSD: ultrix_misc.c,v 1.21 2001/10/31 10:56:11 art Exp $ */ /* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */ /* @@ -308,15 +308,12 @@ async_daemon(p, v, retval) int ultrix_sys_mmap(p, v, retval) - register struct proc *p; + struct proc *p; void *v; register_t *retval; { - register struct ultrix_sys_mmap_args *uap = v; + struct ultrix_sys_mmap_args *uap = v; struct sys_mmap_args ouap; - register struct filedesc *fdp; - register struct file *fp; - register struct vnode *vp; /* * Verify the arguments. @@ -340,18 +337,6 @@ ultrix_sys_mmap(p, v, retval) SCARG(&ouap, fd) = SCARG(uap, fd); SCARG(&ouap, pos) = SCARG(uap, pos); - /* - * Special case: if fd refers to /dev/zero, map as MAP_ANON. (XXX) - */ - fdp = p->p_fd; - if ((fp = fd_getfile(fdp, SCARG(&ouap, fd))) != NULL && /*XXX*/ - fp->f_type == DTYPE_VNODE && /*XXX*/ - (vp = (struct vnode *)fp->f_data)->v_type == VCHR && /*XXX*/ - iszerodev(vp->v_rdev)) { /*XXX*/ - SCARG(&ouap, flags) |= MAP_ANON; - SCARG(&ouap, fd) = -1; - } - return (sys_mmap(p, &ouap, retval)); } |