3.5 compat is old, but relied upon by other compats still in tree. the

fhstat syscall, however, isn't needed and can go away.  ok deraadt

2 files changed, 3 insertions, 41 deletions

diff --git a/sys/compat/common/vfs_syscalls_35.c b/sys/compat/common/vfs_syscalls_35.c
index 10d8acc3d0a..46eaf4a7716 100644
--- a/sys/compat/common/vfs_syscalls_35.c
+++ b/sys/compat/common/vfs_syscalls_35.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls_35.c,v 1.4 2009/01/29 22:08:45 guenther Exp $	*/
+/*	$OpenBSD: vfs_syscalls_35.c,v 1.5 2010/07/01 23:10:40 tedu Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -175,40 +175,3 @@ compat_35_sys_fstat(struct proc *p, void *v, register_t *retval)
 	}
 	return (error);
 }
-
-/* ARGSUSED */
-int
-compat_35_sys_fhstat(struct proc *p, void *v, register_t *retval)
-{
-	struct sys_fhstat_args /* {
-		syscallarg(const fhandle_t *) fhp;
-		syscallarg(struct stat35 *) sb;
-	} */ *uap = v;
-	struct stat ub;
-	struct stat35 oub;
-	int error;
-	fhandle_t fh;
-	struct mount *mp;
-	struct vnode *vp;
-
-	/*
-	 * Must be super user
-	 */
-	if ((error = suser(p, 0)))
-		return (error);
-
-	if ((error = copyin(SCARG(uap, fhp), &fh, sizeof(fhandle_t))) != 0)
-		return (error);
-
-	if ((mp = vfs_getvfs(&fh.fh_fsid)) == NULL)
-		return (ESTALE);
-	if ((error = VFS_FHTOVP(mp, &fh.fh_fid, &vp)))
-		return (error);
-	error = vn_stat(vp, &ub, p);
-	vput(vp);
-	if (error)
-		return (error);
-	cvtstat(&ub, &oub);
-	error = copyout(&oub, SCARG(uap, sb), sizeof(oub));
-	return (error);
-}
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index c00f8ab44e5..279bbc72290 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.100 2010/07/01 01:54:38 deraadt Exp $
+;	$OpenBSD: syscalls.master,v 1.101 2010/07/01 23:10:40 tedu Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -516,8 +516,7 @@
 262	UNIMPL
 263	STD		{ int sys_pipe(int *fdp); }
 264	STD		{ int sys_fhopen(const fhandle_t *fhp, int flags); }
-265	COMPAT_35	{ int sys_fhstat(const fhandle_t *fhp, \
-			    struct stat35 *sb); }
+265	UNIMPL
 266	UNIMPL
 267	STD		{ ssize_t sys_preadv(int fd, \
 			  const struct iovec *iovp, int iovcnt, \