Module Name: src
Committed By: pooka
Date: Wed Mar 3 11:02:34 UTC 2010
Modified Files:
src/sys/compat/sunos32: sunos32_misc.c
src/sys/compat/ultrix: ultrix_misc.c
Log Message:
Remove nfssvc non-emulations I missed yesterday.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/sunos32/sunos32_misc.c
cvs rdiff -u -r1.119 -r1.120 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/sunos32/sunos32_misc.c
diff -u src/sys/compat/sunos32/sunos32_misc.c:1.70 src/sys/compat/sunos32/sunos32_misc.c:1.71
--- src/sys/compat/sunos32/sunos32_misc.c:1.70 Wed Mar 3 10:56:47 2010
+++ src/sys/compat/sunos32/sunos32_misc.c Wed Mar 3 11:02:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_misc.c,v 1.70 2010/03/03 10:56:47 martin Exp $ */
+/* $NetBSD: sunos32_misc.c,v 1.71 2010/03/03 11:02:34 pooka Exp $ */
/* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */
/*
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.70 2010/03/03 10:56:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.71 2010/03/03 11:02:34 pooka Exp $");
#define COMPAT_SUNOS 1
@@ -997,37 +997,6 @@
return ret;
}
-struct sunos32_sys_nfssvc_args;
-int sunos32_sys_nfssvc(struct lwp *l, const struct sunos32_sys_nfssvc_args *uap, register_t *retval);
-int
-sunos32_sys_nfssvc(struct lwp *l, const struct sunos32_sys_nfssvc_args *uap, register_t *retval)
-{
-#if 0
- struct emul *e = p->p_emul;
- struct sys_nfssvc_args outuap;
- struct sockaddr sa;
- int error;
- void *sg = stackgap_init(p, 0);
-
- memset(&outuap, 0, sizeof outuap);
- SCARG(&outuap, fd) = SCARG(uap, fd);
- SCARG(&outuap, mskval) = stackgap_alloc(p, &sg, sizeof(sa));
- SCARG(&outuap, msklen) = sizeof(sa);
- SCARG(&outuap, mtchval) = stackgap_alloc(p, &sg, sizeof(sa));
- SCARG(&outuap, mtchlen) = sizeof(sa);
-
- memset(&sa, 0, sizeof sa);
- if (error = copyout(&sa, SCARG(&outuap, mskval), SCARG(&outuap, msklen)))
- return (error);
- if (error = copyout(&sa, SCARG(&outuap, mtchval), SCARG(&outuap, mtchlen)))
- return (error);
-
- return nfssvc(l, &outuap, retval);
-#else
- return (ENOSYS);
-#endif
-}
-
int
sunos32_sys_ustat(struct lwp *l, const struct sunos32_sys_ustat_args *uap, register_t *retval)
{
Index: src/sys/compat/ultrix/ultrix_misc.c
diff -u src/sys/compat/ultrix/ultrix_misc.c:1.119 src/sys/compat/ultrix/ultrix_misc.c:1.120
--- src/sys/compat/ultrix/ultrix_misc.c:1.119 Tue Mar 2 21:09:21 2010
+++ src/sys/compat/ultrix/ultrix_misc.c Wed Mar 3 11:02:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_misc.c,v 1.119 2010/03/02 21:09:21 pooka Exp $ */
+/* $NetBSD: ultrix_misc.c,v 1.120 2010/03/03 11:02:34 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.119 2010/03/02 21:09:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.120 2010/03/03 11:02:34 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -449,37 +449,6 @@
return sys_setpgid(l, &ap, retval);
}
-int
-ultrix_sys_nfssvc(struct lwp *l, const struct ultrix_sys_nfssvc_args *uap,
- register_t *retval)
-{
-
-#if 0 /* XXX */
- struct emul *e = p->p_emul;
- struct sys_nfssvc_args outuap;
- struct sockaddr sa;
- int error;
- void *sg = stackgap_init(p, 0);
-
- memset(&outuap, 0, sizeof outuap);
- SCARG(&outuap, fd) = SCARG(uap, fd);
- SCARG(&outuap, mskval) = stackgap_alloc(p, &sg, sizeof sa);
- SCARG(&outuap, msklen) = sizeof sa;
- SCARG(&outuap, mtchval) = stackgap_alloc(p, &sg, sizeof sa);
- SCARG(&outuap, mtchlen) = sizeof sa;
-
- memset(&sa, 0, sizeof sa);
- if (error = copyout(&sa, SCARG(&outuap, mskval), SCARG(&outuap, msklen)))
- return error;
- if (error = copyout(&sa, SCARG(&outuap, mtchval), SCARG(&outuap, mtchlen)))
- return error;
-
- return nfssvc(l, &outuap, retval);
-#else
- return ENOSYS;
-#endif
-}
-
struct ultrix_ustat {
daddr_t f_tfree; /* total free */
uint32_t f_tinode; /* total inodes free */
