CVS commit: src/sys/nfs

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Dec 31 19:38:16 UTC 2009

Modified Files:
        src/sys/nfs: files.nfs nfs_iod.c nfs_syscalls.c

Log Message:
handle the nuidhash_max lossage differently


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/nfs/files.nfs
cvs rdiff -u -r1.3 -r1.4 src/sys/nfs/nfs_iod.c
cvs rdiff -u -r1.151 -r1.152 src/sys/nfs/nfs_syscalls.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/nfs/files.nfs
diff -u src/sys/nfs/files.nfs:1.10 src/sys/nfs/files.nfs:1.11
--- src/sys/nfs/files.nfs:1.10	Thu Dec 31 14:30:45 2009
+++ src/sys/nfs/files.nfs	Thu Dec 31 14:38:16 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: files.nfs,v 1.10 2009/12/31 19:30:45 christos Exp $
+#	$NetBSD: files.nfs,v 1.11 2009/12/31 19:38:16 christos Exp $
 
 deffs	fs_nfs.h		NFS
 
@@ -23,7 +23,7 @@
 file	nfs/nfs_bootparam.c	nfs & nfs_boot_bootparam
 file	nfs/nfs_bootstatic.c	nfs & nfs_boot_bootstatic
 file	nfs/nfs_export.c	nfsserver
-file	nfs/nfs_iod.c		nfsserver | nfs
+file	nfs/nfs_iod.c		nfs
 file	nfs/nfs_kq.c		nfs
 file	nfs/nfs_node.c		nfs
 file	nfs/nfs_serv.c		nfsserver

Index: src/sys/nfs/nfs_iod.c
diff -u src/sys/nfs/nfs_iod.c:1.3 src/sys/nfs/nfs_iod.c:1.4
--- src/sys/nfs/nfs_iod.c:1.3	Sat Mar 14 17:04:25 2009
+++ src/sys/nfs/nfs_iod.c	Thu Dec 31 14:38:16 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_iod.c,v 1.3 2009/03/14 21:04:25 dsl Exp $	*/
+/*	$NetBSD: nfs_iod.c,v 1.4 2009/12/31 19:38:16 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_iod.c,v 1.3 2009/03/14 21:04:25 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_iod.c,v 1.4 2009/12/31 19:38:16 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,7 @@
 #include <nfs/nfsrtt.h>
 #include <nfs/nfs_var.h>
 
-int nuidhash_max = NFS_MAXUIDHASH;
+extern int nuidhash_max;
 
 /*
  * locking order:

Index: src/sys/nfs/nfs_syscalls.c
diff -u src/sys/nfs/nfs_syscalls.c:1.151 src/sys/nfs/nfs_syscalls.c:1.152
--- src/sys/nfs/nfs_syscalls.c:1.151	Wed Oct 21 17:12:06 2009
+++ src/sys/nfs/nfs_syscalls.c	Thu Dec 31 14:38:16 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_syscalls.c,v 1.151 2009/10/21 21:12:06 rmind Exp $	*/
+/*	$NetBSD: nfs_syscalls.c,v 1.152 2009/12/31 19:38:16 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.151 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.152 2009/12/31 19:38:16 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +79,7 @@
 						struct nfssvc_sock *,
 						struct lwp *, struct mbuf **);
 extern int nfsrvw_procrastinate;
-extern int nuidhash_max;
+int nuidhash_max = NFS_MAXUIDHASH;
 
 static int nfs_numnfsd = 0;
 static struct nfsdrt nfsdrt;