nfsd: remove include/linux/nfsd/syscall.h

We don't need this any more.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/compat.c b/fs/compat.c
index 0b48d018e38adbc1a72f78a4ab851626f2fffca8..f2b36d472c73a524758027c4329ccfa8d7e31e1b 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -37,7 +37,6 @@
 #include <linux/dirent.h>
 #include <linux/fsnotify.h>
 #include <linux/highuid.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/personality.h>
 #include <linux/rwsem.h>
 #include <linux/tsacct_kern.h>

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index f4cc1e2bfc54201f5b478068dca20d1862e709bf..d491421cd708933844fc9d264aca9b1db22a40c6 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/exportfs.h>
 
-#include <linux/nfsd/syscall.h>
 #include <net/ipv6.h>
 
 #include "nfsd.h"

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index c7716143cbd1df17c79aeedc184006d7672ccacc..db34a585e1129926b672ccc9f5a2f4b42c0a6f2e 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -9,7 +9,6 @@
 #include <linux/ctype.h>
 
 #include <linux/sunrpc/svcsock.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/lockd/lockd.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/gss_api.h>

diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
index 0e528606d46fa9750e1bafb4a193e915cbe146f4..b8d4001212b30bbd94f7a8d47a3afe32e5dd229e 100644 (file)
--- a/include/linux/nfsd/Kbuild
+++ b/include/linux/nfsd/Kbuild
@@ -2,4 +2,3 @@ header-y += debug.h
 header-y += export.h
 header-y += nfsfh.h
 header-y += stats.h
-header-y += syscall.h

diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h
deleted file mode 100644 (file)
index 812bc1e..0000000
--- a/include/linux/nfsd/syscall.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * include/linux/nfsd/syscall.h
- *
- * This file holds all declarations for the knfsd syscall interface.
- *
- * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef NFSD_SYSCALL_H
-#define NFSD_SYSCALL_H
-
-#include <linux/types.h>
-#include <linux/nfsd/export.h>
-
-/*
- * Version of the syscall interface
- */
-#define NFSCTL_VERSION         0x0201
-
-/*
- * These are the commands understood by nfsctl().
- */
-#define NFSCTL_SVC             0       /* This is a server process. */
-#define NFSCTL_ADDCLIENT       1       /* Add an NFS client. */
-#define NFSCTL_DELCLIENT       2       /* Remove an NFS client. */
-#define NFSCTL_EXPORT          3       /* export a file system. */
-#define NFSCTL_UNEXPORT                4       /* unexport a file system. */
-/*#define NFSCTL_UGIDUPDATE    5       / * update a client's uid/gid map. DISCARDED */
-/*#define NFSCTL_GETFH         6       / * get an fh by ino DISCARDED */
-#define NFSCTL_GETFD           7       /* get an fh by path (used by mountd) */
-#define        NFSCTL_GETFS            8       /* get an fh by path with max FH len */
-
-/* SVC */
-struct nfsctl_svc {
-       unsigned short          svc_port;
-       int                     svc_nthreads;
-};
-
-/* ADDCLIENT/DELCLIENT */
-struct nfsctl_client {
-       char                    cl_ident[NFSCLNT_IDMAX+1];
-       int                     cl_naddr;
-       struct in_addr          cl_addrlist[NFSCLNT_ADDRMAX];
-       int                     cl_fhkeytype;
-       int                     cl_fhkeylen;
-       unsigned char           cl_fhkey[NFSCLNT_KEYMAX];
-};
-
-/* EXPORT/UNEXPORT */
-struct nfsctl_export {
-       char                    ex_client[NFSCLNT_IDMAX+1];
-       char                    ex_path[NFS_MAXPATHLEN+1];
-       __kernel_old_dev_t      ex_dev;
-       __kernel_ino_t          ex_ino;
-       int                     ex_flags;
-       __kernel_uid_t          ex_anon_uid;
-       __kernel_gid_t          ex_anon_gid;
-};
-
-/* GETFD */
-struct nfsctl_fdparm {
-       struct sockaddr         gd_addr;
-       char                    gd_path[NFS_MAXPATHLEN+1];
-       int                     gd_version;
-};
-
-/* GETFS - GET Filehandle with Size */
-struct nfsctl_fsparm {
-       struct sockaddr         gd_addr;
-       char                    gd_path[NFS_MAXPATHLEN+1];
-       int                     gd_maxlen;
-};
-
-/*
- * This is the argument union.
- */
-struct nfsctl_arg {
-       int                     ca_version;     /* safeguard */
-       union {
-               struct nfsctl_svc       u_svc;
-               struct nfsctl_client    u_client;
-               struct nfsctl_export    u_export;
-               struct nfsctl_fdparm    u_getfd;
-               struct nfsctl_fsparm    u_getfs;
-               /*
-                * The following dummy member is needed to preserve binary compatibility
-                * on platforms where alignof(void*)>alignof(int).  It's needed because
-                * this union used to contain a member (u_umap) which contained a
-                * pointer.
-                */
-               void *u_ptr;
-       } u;
-#define ca_svc         u.u_svc
-#define ca_client      u.u_client
-#define ca_export      u.u_export
-#define ca_getfd       u.u_getfd
-#define        ca_getfs        u.u_getfs
-};
-
-union nfsctl_res {
-       __u8                    cr_getfh[NFS_FHSIZE];
-       struct knfsd_fh         cr_getfs;
-};
-
-#ifdef __KERNEL__
-/*
- * Kernel syscall implementation.
- */
-extern int             exp_addclient(struct nfsctl_client *ncp);
-extern int             exp_delclient(struct nfsctl_client *ncp);
-extern int             exp_export(struct nfsctl_export *nxp);
-extern int             exp_unexport(struct nfsctl_export *nxp);
-
-#endif /* __KERNEL__ */
-
-#endif /* NFSD_SYSCALL_H */