Kill fs_nfs.h and #ifdef NFS by making getfh() support unconditional
and nfssvc unsupport unconditional. nfs server was just a fancy NOP anyway for all except Ultrix. I know I'm boring but I couldn't imagine why someone would want to run an Ultrix nfs server (and I also doubt that it would work anymore with all the changes to fs exporting etc).
This commit is contained in:
pooka
parent
9026066df1
commit
c20692bba4
@ -1,4 +1,4 @@
|
||||
$NetBSD: syscalls.master,v 1.35 2010/03/02 16:08:15 pooka Exp $
|
||||
$NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp $
|
||||
|
||||
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
|
||||
|
||||
@ -41,8 +41,6 @@
|
||||
#include "opt_compat_netbsd.h"
|
||||
#include "opt_sysv.h"
|
||||
#include "opt_compat_43.h"
|
||||
|
||||
#include "fs_nfs.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -423,11 +421,7 @@
|
||||
152 UNIMPL
|
||||
153 UNIMPL
|
||||
154 UNIMPL
|
||||
#if defined(NFSSERVER) || !defined(_KERNEL)
|
||||
155 NOARGS { int|sys||nfssvc(int flag, void *argp); }
|
||||
#else
|
||||
155 EXCL nfssvc
|
||||
#endif
|
||||
#if defined(COMPAT_43) || !defined(_KERNEL)
|
||||
156 NOARGS { int|compat_43_sys||getdirentries(int fd, char *buf, \
|
||||
u_int count, long *basep); } ogetdirentries
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$NetBSD: syscalls.master,v 1.39 2010/03/02 16:00:03 pooka Exp $
|
||||
$NetBSD: syscalls.master,v 1.40 2010/03/02 21:07:21 pooka Exp $
|
||||
|
||||
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
|
||||
|
||||
@ -41,8 +41,6 @@
|
||||
#include "opt_sysv.h"
|
||||
#include "opt_compat_43.h"
|
||||
|
||||
#include "fs_nfs.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/signal.h>
|
||||
@ -317,11 +315,7 @@
|
||||
152 UNIMPL setprivexec
|
||||
153 UNIMPL pread
|
||||
154 UNIMPL pwrite
|
||||
#if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
|
||||
155 NOARGS { int|sys||nfssvc(int flag, void *argp); }
|
||||
#else
|
||||
155 EXCL nfssvc
|
||||
#endif
|
||||
156 NOARGS { int|compat_43_sys||getdirentries(int fd, char *buf, \
|
||||
u_int count, long *basep); } ogetdirentries
|
||||
157 STD { int|darwin_sys||statfs(const char *path, \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$NetBSD: syscalls.master,v 1.63 2010/03/02 16:00:03 pooka Exp $
|
||||
$NetBSD: syscalls.master,v 1.64 2010/03/02 21:07:21 pooka Exp $
|
||||
|
||||
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
|
||||
|
||||
@ -301,12 +301,8 @@
|
||||
struct statfs12 *buf); }
|
||||
159 UNIMPL
|
||||
160 UNIMPL
|
||||
#ifdef NFS
|
||||
161 NOARGS { int|compat_30_sys||getfh(const char *fname, \
|
||||
struct compat_30_fhandle *fhp); }
|
||||
#else
|
||||
161 UNIMPL getfh
|
||||
#endif
|
||||
162 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
|
||||
int len); }
|
||||
163 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$NetBSD: syscalls.master,v 1.83 2010/03/02 16:02:43 pooka Exp $
|
||||
$NetBSD: syscalls.master,v 1.84 2010/03/02 21:07:21 pooka Exp $
|
||||
|
||||
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
|
||||
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
|
||||
@ -42,8 +42,6 @@
|
||||
#include "opt_sysv.h"
|
||||
#include "opt_compat_43.h"
|
||||
#include "opt_posix.h"
|
||||
|
||||
#include "fs_nfs.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -320,7 +318,7 @@
|
||||
152 UNIMPL
|
||||
153 UNIMPL
|
||||
154 UNIMPL
|
||||
155 STD { int|netbsd32||nfssvc(int flag, netbsd32_voidp argp); }
|
||||
155 UNIMPL netbsd32_nfssvc
|
||||
156 COMPAT_43 { int|netbsd32||ogetdirentries(int fd, \
|
||||
netbsd32_charp buf, u_int count, \
|
||||
netbsd32_longp basep); }
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $NetBSD: syscalls.master,v 1.20 2009/01/13 22:27:44 pooka Exp $
|
||||
; $NetBSD: syscalls.master,v 1.21 2010/03/02 21:07:22 pooka Exp $
|
||||
|
||||
; from :NetBSD: syscalls.master,v 1.57 2000/12/09 07:10:36 mycroft Exp
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_sysv.h"
|
||||
#include "opt_compat_sunos.h"
|
||||
|
||||
#include "fs_nfs.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -248,7 +246,7 @@
|
||||
153 NOARGS { int|netbsd32||poll(netbsd32_pollfdp_t fds, u_int nfds, \
|
||||
int timeout); }
|
||||
154 UNIMPL
|
||||
155 STD { int|sunos32_sys||nfssvc(int fd); }
|
||||
155 UNIMPL nfssvc
|
||||
156 NOARGS { int|compat_43_netbsd32||ogetdirentries(int fd, netbsd32_charp buf, \
|
||||
u_int count, netbsd32_longp basep); }
|
||||
157 STD { int|sunos32_sys||statfs(const netbsd32_charp path, \
|
||||
@ -256,13 +254,8 @@
|
||||
158 STD { int|sunos32_sys||fstatfs(int fd, \
|
||||
sunos32_statfsp_t buf); }
|
||||
159 STD { int|sunos32_sys||unmount(netbsd32_charp path); }
|
||||
#ifdef NFS
|
||||
160 NOARGS { int|async||daemon(void); }
|
||||
160 UNIMPL async_daemon
|
||||
161 NOARGS { int|compat_30_sys||getfh(netbsd32_charp fname, netbsd32_fhandlep_t fhp); }
|
||||
#else
|
||||
160 UNIMPL
|
||||
161 UNIMPL
|
||||
#endif
|
||||
162 NOARGS { int|compat_09_netbsd32||ogetdomainname(netbsd32_charp domainname, \
|
||||
int len); }
|
||||
163 NOARGS { int|compat_09_netbsd32||osetdomainname(netbsd32_charp domainname, \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$NetBSD: syscalls.master,v 1.50 2009/01/17 15:48:06 he Exp $
|
||||
$NetBSD: syscalls.master,v 1.51 2010/03/02 21:07:22 pooka Exp $
|
||||
|
||||
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
|
||||
|
||||
@ -31,10 +31,6 @@
|
||||
; #ifdef's, etc. may be included, and are copied to the output files.
|
||||
; #include's are copied to the syscall names and switch definition files only.
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "fs_nfs.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/signal.h>
|
||||
@ -249,7 +245,7 @@
|
||||
155 UNIMPL atomic_op
|
||||
156 UNIMPL
|
||||
157 UNIMPL
|
||||
158 STD { int|ultrix_sys||nfssvc(int fd); }
|
||||
158 UNIMPL ultrix_sys_nfssvc
|
||||
159 NOARGS { int|compat_43_sys||getdirentries(int fd, char *buf, \
|
||||
u_int count, long *basep); }
|
||||
160 STD { int|ultrix_sys||statfs(const char *path, \
|
||||
@ -257,13 +253,8 @@
|
||||
161 STD { int|ultrix_sys||fstatfs(int fd, \
|
||||
struct ultrix_statfs *buf); }
|
||||
162 UNIMPL umount
|
||||
#ifdef NFS
|
||||
163 NOARGS { int|async||daemon(void); }
|
||||
164 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
|
||||
#else
|
||||
163 UNIMPL async_daemon
|
||||
164 UNIMPL getfh
|
||||
#endif
|
||||
164 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
|
||||
165 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
|
||||
int len); }
|
||||
166 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user