Fri Nov 6 09:16:49 2015 UTC ()
Additionally pull up following revision(s) (requested by mrg in ticket #956):
	sys/compat/netbsd32/netbsd32_nfssvc.c: revision 1.2
	sys/compat/netbsd32/syscalls.master: revision 1.109
Don't reference netbsd32_nfssvc unless NFSSERVER is defined.
Fixes PR 49994.
add missing opt_nfsserver.h


(martin)
diff -r1.3.4.2 -r1.3.4.3 src/sys/compat/netbsd32/netbsd32_nfssvc.c
diff -r1.101.2.2 -r1.101.2.3 src/sys/compat/netbsd32/syscalls.master
cvs diff -r1.3.4.2 -r1.3.4.3 src/sys/compat/netbsd32/netbsd32_nfssvc.c (expand / switch to unified diff)

--- src/sys/compat/netbsd32/netbsd32_nfssvc.c 2015/11/04 17:46:21 1.3.4.2
+++ src/sys/compat/netbsd32/netbsd32_nfssvc.c 2015/11/06 09:16:48 1.3.4.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: netbsd32_nfssvc.c,v 1.3.4.2 2015/11/04 17:46:21 riz Exp $ */ 1/* $NetBSD: netbsd32_nfssvc.c,v 1.3.4.3 2015/11/06 09:16:48 martin Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2015 Matthew R. Green 4 * Copyright (c) 2015 Matthew R. Green
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -19,30 +19,31 @@ @@ -19,30 +19,31 @@
19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 19 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 22 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
23 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 23 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
25 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 25 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE. 28 * SUCH DAMAGE.
29 */ 29 */
30 30
31#include <sys/cdefs.h> 31#include <sys/cdefs.h>
32__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.3.4.2 2015/11/04 17:46:21 riz Exp $"); 32__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.3.4.3 2015/11/06 09:16:48 martin Exp $");
33 33
34#if defined(_KERNEL_OPT) 34#if defined(_KERNEL_OPT)
35#include "opt_nfs.h" 35#include "opt_nfs.h"
 36#include "opt_nfsserver.h"
36#include "opt_compat_netbsd.h" 37#include "opt_compat_netbsd.h"
37#endif 38#endif
38 39
39#include <sys/param.h> 40#include <sys/param.h>
40#include <sys/vnode.h> 41#include <sys/vnode.h>
41#include <sys/filedesc.h> 42#include <sys/filedesc.h>
42 43
43#include <compat/netbsd32/netbsd32.h> 44#include <compat/netbsd32/netbsd32.h>
44#include <compat/netbsd32/netbsd32_syscall.h> 45#include <compat/netbsd32/netbsd32_syscall.h>
45#include <compat/netbsd32/netbsd32_syscallargs.h> 46#include <compat/netbsd32/netbsd32_syscallargs.h>
46#include <compat/netbsd32/netbsd32_conv.h> 47#include <compat/netbsd32/netbsd32_conv.h>
47 48
48#include <nfs/rpcv2.h> 49#include <nfs/rpcv2.h>
cvs diff -r1.101.2.2 -r1.101.2.3 src/sys/compat/netbsd32/syscalls.master (expand / switch to unified diff)

--- src/sys/compat/netbsd32/syscalls.master 2015/11/04 17:46:21 1.101.2.2
+++ src/sys/compat/netbsd32/syscalls.master 2015/11/06 09:16:48 1.101.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1 $NetBSD: syscalls.master,v 1.101.2.2 2015/11/04 17:46:21 riz Exp $ 1 $NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp $
2 2
3; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp 3; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
4; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 4; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
5 5
6; NetBSD system call name/number "master" file. 6; NetBSD system call name/number "master" file.
7; (See syscalls.conf to see what it is processed into.) 7; (See syscalls.conf to see what it is processed into.)
8; 8;
9; Fields: number type [type-dependent ...] 9; Fields: number type [type-dependent ...]
10; number system call number, must be in order 10; number system call number, must be in order
11; type one of STD, OBSOL, UNIMPL, IGNORED, NODEF, NOARGS, or one of 11; type one of STD, OBSOL, UNIMPL, IGNORED, NODEF, NOARGS, or one of
12; the compatibility options defined in syscalls.conf. 12; the compatibility options defined in syscalls.conf.
13; 13;
14; types: 14; types:
@@ -28,26 +28,27 @@ @@ -28,26 +28,27 @@
28; 'libcompat' options). 28; 'libcompat' options).
29; 29;
30; The type-dependent arguments are as follows: 30; The type-dependent arguments are as follows:
31; For STD, NODEF, NOARGS, and compat syscalls: 31; For STD, NODEF, NOARGS, and compat syscalls:
32; { pseudo-proto } [alias] 32; { pseudo-proto } [alias]
33; For other syscalls: 33; For other syscalls:
34; [comment] 34; [comment]
35; 35;
36; #ifdef's, etc. may be included, and are copied to the output files. 36; #ifdef's, etc. may be included, and are copied to the output files.
37; #include's are copied to the syscall names and switch definition files only. 37; #include's are copied to the syscall names and switch definition files only.
38 38
39#if defined(_KERNEL_OPT) 39#if defined(_KERNEL_OPT)
40#include "opt_compat_netbsd.h" 40#include "opt_compat_netbsd.h"
 41#include "opt_nfsserver.h"
41#include "opt_ntp.h" 42#include "opt_ntp.h"
42#include "opt_sysv.h" 43#include "opt_sysv.h"
43#include "opt_compat_43.h" 44#include "opt_compat_43.h"
44#endif 45#endif
45 46
46#include <sys/param.h> 47#include <sys/param.h>
47#include <sys/systm.h> 48#include <sys/systm.h>
48#include <sys/signal.h> 49#include <sys/signal.h>
49#include <sys/mount.h> 50#include <sys/mount.h>
50#include <sys/syscallargs.h> 51#include <sys/syscallargs.h>
51 52
52#include <compat/netbsd32/netbsd32.h> 53#include <compat/netbsd32/netbsd32.h>
53#include <compat/netbsd32/netbsd32_syscallargs.h> 54#include <compat/netbsd32/netbsd32_syscallargs.h>
@@ -307,27 +308,31 @@ @@ -307,27 +308,31 @@
307 int uid, netbsd32_voidp arg); } 308 int uid, netbsd32_voidp arg); }
308149 COMPAT_43 { int|sys||quota(void); } oquota 309149 COMPAT_43 { int|sys||quota(void); } oquota
309150 COMPAT_43 { int|netbsd32||ogetsockname(int fdec, \ 310150 COMPAT_43 { int|netbsd32||ogetsockname(int fdec, \
310 netbsd32_voidp asa, netbsd32_intp alen); } 311 netbsd32_voidp asa, netbsd32_intp alen); }
311 312
312; Syscalls 151-180 inclusive are reserved for vendor-specific 313; Syscalls 151-180 inclusive are reserved for vendor-specific
313; system calls. (This includes various calls added for compatibity 314; system calls. (This includes various calls added for compatibity
314; with other Unix variants.) 315; with other Unix variants.)
315; Some of these calls are now supported by BSD... 316; Some of these calls are now supported by BSD...
316151 UNIMPL 317151 UNIMPL
317152 UNIMPL 318152 UNIMPL
318153 UNIMPL 319153 UNIMPL
319154 UNIMPL 320154 UNIMPL
 321#if defined(NFSSERVER) || !defined(_KERNEL_OPT)
320155 STD { int|netbsd32||nfssvc(int flag, netbsd32_voidp argp); } 322155 STD { int|netbsd32||nfssvc(int flag, netbsd32_voidp argp); }
 323#else
 324155 EXCL netbsd32_nfssvc
 325#endif
321156 COMPAT_43 { int|netbsd32||ogetdirentries(int fd, \ 326156 COMPAT_43 { int|netbsd32||ogetdirentries(int fd, \
322 netbsd32_charp buf, u_int count, \ 327 netbsd32_charp buf, u_int count, \
323 netbsd32_longp basep); } 328 netbsd32_longp basep); }
324157 COMPAT_20 { int|netbsd32||statfs(netbsd32_charp path, \ 329157 COMPAT_20 { int|netbsd32||statfs(netbsd32_charp path, \
325 netbsd32_statfsp_t buf); } 330 netbsd32_statfsp_t buf); }
326158 COMPAT_20 { int|netbsd32||fstatfs(int fd, \ 331158 COMPAT_20 { int|netbsd32||fstatfs(int fd, \
327 netbsd32_statfsp_t buf); } 332 netbsd32_statfsp_t buf); }
328159 UNIMPL 333159 UNIMPL
329160 UNIMPL 334160 UNIMPL
330161 COMPAT_30 { int|netbsd32||getfh(netbsd32_charp fname, \ 335161 COMPAT_30 { int|netbsd32||getfh(netbsd32_charp fname, \
331 netbsd32_compat_30_fhandlep_t fhp); } 336 netbsd32_compat_30_fhandlep_t fhp); }
332162 COMPAT_09 { int|netbsd32||ogetdomainname( \ 337162 COMPAT_09 { int|netbsd32||ogetdomainname( \
333 netbsd32_charp domainname, int len); } 338 netbsd32_charp domainname, int len); }