diff options
| author |   tedu <tedu@openbsd.org> | 2010-06-29 17:13:59 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2010-06-29 17:13:59 +0000 |
| commit | b5df6b202f3d61633ca25dea90ea29dd05ddeb20 (patch) | |
| tree | 73d64da80e1800201c28594224afc22197925104 | |
| parent | Support for badly nested blocks, written around the time of (diff) | |
| download | wireguard-openbsd-b5df6b202f3d61633ca25dea90ea29dd05ddeb20.tar.xz wireguard-openbsd-b5df6b202f3d61633ca25dea90ea29dd05ddeb20.zip | |
Remove the "if the string address faulted, see if it looks like an int"
4.3 compat code in mount. This is a flag day for those of you still running
4.3 BSD binaries on your vaxen. :)
ok deraadt dlg guenther thib
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 430a53aed04..85847b99685 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.160 2010/06/29 04:07:39 tedu Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.161 2010/06/29 17:13:59 tedu Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -88,9 +88,6 @@ sys_mount(struct proc *p, void *v, register_t *retval) struct vnode *vp; struct mount *mp; int error, mntflag = 0; -#ifdef COMPAT_43 - u_long fstypenum = 0; -#endif char fstypename[MFSNAMELEN]; char fspath[MNAMELEN]; struct vattr va; @@ -196,28 +193,8 @@ sys_mount(struct proc *p, void *v, register_t *retval) } error = copyinstr(SCARG(uap, type), fstypename, MFSNAMELEN, NULL); if (error) { -#ifdef COMPAT_43 - /* - * Historically filesystem types were identified by number. - * If we get an integer for the filesystem type instead of a - * string, we check to see if it matches one of the historic - * filesystem types. - */ - fstypenum = (u_long)SCARG(uap, type); - - for (vfsp = vfsconf; vfsp; vfsp = vfsp->vfc_next) - if (vfsp->vfc_typenum == fstypenum) - break; - if (vfsp == NULL) { - vput(vp); - return (ENODEV); - } - strncpy(fstypename, vfsp->vfc_name, MFSNAMELEN); - -#else vput(vp); return (error); -#endif } for (vfsp = vfsconf; vfsp; vfsp = vfsp->vfc_next) { if (!strcmp(vfsp->vfc_name, fstypename)) |