diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-05-30 17:20:30 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-05-30 17:20:30 +0000 |
| commit | 388ab7a7a786afc1db5c67fce6797014a16414dc (patch) | |
| tree | 13767e39e7ed01d04d130e64445f31ab330cda95 /sys/nfs | |
| parent | 56e3b88f157311cfee6e0f3cd76541e9471636e9 (diff) | |
Remove unused procnums (NQNFS leftovers) and cleanup.
OK blambert@ sometime ago
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_socket.c | 3 | ||||
| -rw-r--r-- | sys/nfs/nfs_srvcache.c | 5 | ||||
| -rw-r--r-- | sys/nfs/nfs_subs.c | 10 | ||||
| -rw-r--r-- | sys/nfs/nfs_syscalls.c | 5 | ||||
| -rw-r--r-- | sys/nfs/nfsproto.h | 7 |
5 files changed, 9 insertions, 21 deletions
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index 04d6364a4db..a8041b8de8c 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_socket.c,v 1.80 2009/05/22 00:19:25 thib Exp $ */ +/* $OpenBSD: nfs_socket.c,v 1.81 2009/05/30 17:20:29 thib Exp $ */ /* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */ /* @@ -107,7 +107,6 @@ extern int nfs_ticks; */ static int proct[NFS_NPROCS] = { 0, 1, 0, 2, 1, 3, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 0, 0, 0, 0, 0, - 0, 0, 0, }; /* diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c index 30d84efb614..14d78f9497b 100644 --- a/sys/nfs/nfs_srvcache.c +++ b/sys/nfs/nfs_srvcache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_srvcache.c,v 1.21 2008/12/24 02:43:52 thib Exp $ */ +/* $OpenBSD: nfs_srvcache.c,v 1.22 2009/05/30 17:20:29 thib Exp $ */ /* $NetBSD: nfs_srvcache.c,v 1.12 1996/02/18 11:53:49 fvdl Exp $ */ /* @@ -76,8 +76,7 @@ u_long nfsrvhash; int nonidempotent[NFS_NPROCS] = { 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0 + 0, 0, 0, 0, 0, 0, 0 }; /* True iff the rpc reply is an nfs status ONLY! */ diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index ead5679fbf5..80acea94818 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.95 2009/05/22 00:19:25 thib Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.96 2009/05/30 17:20:29 thib Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -120,9 +120,6 @@ int nfsv3_procid[NFS_NPROCS] = { NFSPROC_NOOP, NFSPROC_NOOP, NFSPROC_NOOP, - NFSPROC_NOOP, - NFSPROC_NOOP, - NFSPROC_NOOP, NFSPROC_NOOP }; @@ -152,10 +149,7 @@ int nfsv2_procid[NFS_NPROCS] = { NFSV2PROC_NOOP, NFSV2PROC_NOOP, NFSV2PROC_NOOP, - NFSV2PROC_NOOP, - NFSV2PROC_NOOP, - NFSV2PROC_NOOP, - NFSV2PROC_NOOP, + NFSV2PROC_NOOP }; /* diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index eecf47b6db6..791c0076cf6 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_syscalls.c,v 1.77 2009/05/22 00:19:25 thib Exp $ */ +/* $OpenBSD: nfs_syscalls.c,v 1.78 2009/05/30 17:20:29 thib Exp $ */ /* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */ /* @@ -106,9 +106,6 @@ int (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *, nfsrv_fsinfo, nfsrv_pathconf, nfsrv_commit, - nfsrv_noop, - nfsrv_noop, - nfsrv_noop, nfsrv_noop }; #endif diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h index 9f0518b6056..05c28024ee6 100644 --- a/sys/nfs/nfsproto.h +++ b/sys/nfs/nfsproto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsproto.h,v 1.8 2008/08/08 21:44:44 thib Exp $ */ +/* $OpenBSD: nfsproto.h,v 1.9 2009/05/30 17:20:29 thib Exp $ */ /* $NetBSD: nfsproto.h,v 1.1 1996/02/18 11:54:06 fvdl Exp $ */ /* @@ -169,9 +169,8 @@ #define NFSPROC_FSINFO 19 #define NFSPROC_PATHCONF 20 #define NFSPROC_COMMIT 21 - -#define NFSPROC_NOOP 25 -#define NFS_NPROCS 26 +#define NFSPROC_NOOP 22 +#define NFS_NPROCS 23 /* Actual Version 2 procedure numbers */ #define NFSV2PROC_NULL 0 |