Module Name: src
Committed By: pooka
Date: Tue Mar 2 21:09:22 UTC 2010
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
src/sys/compat/osf1: osf1_mount.c
src/sys/compat/sunos32: sunos32_misc.c
src/sys/compat/ultrix: ultrix_misc.c
Log Message:
remove nfssvc emulation (or non-emulation)
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.46 -r1.47 src/sys/compat/osf1/osf1_mount.c
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/sunos32/sunos32_misc.c
cvs rdiff -u -r1.118 -r1.119 src/sys/compat/ultrix/ultrix_misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.165 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.166
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.165 Tue Mar 2 16:08:15 2010
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.165 2010/03/02 16:08:15 pooka Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.166 2010/03/02 21:09:21 pooka Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.165 2010/03/02 16:08:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.166 2010/03/02 21:09:21 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -1204,25 +1204,6 @@
}
int
-netbsd32_nfssvc(struct lwp *l, const struct netbsd32_nfssvc_args *uap, register_t *retval)
-{
-#if 0
- /* {
- syscallarg(int) flag;
- syscallarg(netbsd32_voidp) argp;
- } */
- struct sys_nfssvc_args ua;
-
- NETBSD32TO64_UAP(flag);
- NETBSD32TOP_UAP(argp, void);
- return (sys_nfssvc(l, &ua, retval));
-#else
- /* Why would we want to support a 32-bit nfsd? */
- return (ENOSYS);
-#endif
-}
-
-int
netbsd32___getfh30(struct lwp *l, const struct netbsd32___getfh30_args *uap, register_t *retval)
{
/* {
Index: src/sys/compat/osf1/osf1_mount.c
diff -u src/sys/compat/osf1/osf1_mount.c:1.46 src/sys/compat/osf1/osf1_mount.c:1.47
--- src/sys/compat/osf1/osf1_mount.c:1.46 Mon Jun 29 05:08:16 2009
+++ src/sys/compat/osf1/osf1_mount.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_mount.c,v 1.46 2009/06/29 05:08:16 dholland Exp $ */
+/* $NetBSD: osf1_mount.c,v 1.47 2010/03/02 21:09:21 pooka Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,11 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.46 2009/06/29 05:08:16 dholland Exp $");
-
-#if defined(_KERNEL_OPT)
-#include "fs_nfs.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.47 2010/03/02 21:09:21 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/compat/sunos32/sunos32_misc.c
diff -u src/sys/compat/sunos32/sunos32_misc.c:1.67 src/sys/compat/sunos32/sunos32_misc.c:1.68
--- src/sys/compat/sunos32/sunos32_misc.c:1.67 Mon Jun 29 05:08:16 2009
+++ src/sys/compat/sunos32/sunos32_misc.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_misc.c,v 1.67 2009/06/29 05:08:16 dholland Exp $ */
+/* $NetBSD: sunos32_misc.c,v 1.68 2010/03/02 21:09:21 pooka Exp $ */
/* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */
/*
@@ -77,14 +77,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.67 2009/06/29 05:08:16 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.68 2010/03/02 21:09:21 pooka Exp $");
#define COMPAT_SUNOS 1
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
#include "opt_compat_netbsd.h"
-#include "fs_nfs.h"
#endif
#include <sys/param.h>
@@ -528,19 +527,6 @@
0, &dummy);
}
-#if defined(NFS)
-int
-async_daemon(struct lwp *l, const void *v, register_t *retval)
-{
- struct netbsd32_nfssvc_args ouap;
-
- SCARG(&ouap, flag) = NFSSVC_BIOD;
- NETBSD32PTR32(SCARG(&ouap, argp), 0);
-
- return (netbsd32_nfssvc(l, &ouap, retval));
-}
-#endif /* NFS */
-
void native_to_sunos_sigset(const sigset_t *, int *);
void sunos_to_native_sigset(const int, sigset_t *);
Index: src/sys/compat/ultrix/ultrix_misc.c
diff -u src/sys/compat/ultrix/ultrix_misc.c:1.118 src/sys/compat/ultrix/ultrix_misc.c:1.119
--- src/sys/compat/ultrix/ultrix_misc.c:1.118 Sat Jan 17 15:48:06 2009
+++ src/sys/compat/ultrix/ultrix_misc.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_misc.c,v 1.118 2009/01/17 15:48:06 he Exp $ */
+/* $NetBSD: ultrix_misc.c,v 1.119 2010/03/02 21:09:21 pooka Exp $ */
/*
* Copyright (c) 1995, 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.118 2009/01/17 15:48:06 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.119 2010/03/02 21:09:21 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -91,10 +91,6 @@
* handled here.
*/
-#if defined(_KERNEL_OPT)
-#include "fs_nfs.h"
-#endif
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
@@ -304,19 +300,6 @@
return error;
}
-#if defined(NFS)
-int
-async_daemon(struct lwp *l, const void *v, register_t *retval)
-{
- struct sys_nfssvc_args ouap;
-
- SCARG(&ouap, flag) = NFSSVC_BIOD;
- SCARG(&ouap, argp) = NULL;
-
- return sys_nfssvc(l, &ouap, retval);
-}
-#endif /* NFS */
-
#define SUN__MAP_NEW 0x80000000 /* if not, old mmap & cannot handle */
