Sun Nov 8 01:14:20 2015 UTC ()
Pull up following revision(s) (requested by pgoyette in ticket #1021):
	sys/nfs/nfs_vfsops.c: revision 1.231
Don't forget to call nfs_fini() when we're finished.  Without this,
we leave a dangling pool nfsrvdescpl around.


(riz)
diff -r1.229.2.1 -r1.229.2.2 src/sys/nfs/nfs_vfsops.c
cvs diff -r1.229.2.1 -r1.229.2.2 src/sys/nfs/nfs_vfsops.c (expand / switch to unified diff)

--- src/sys/nfs/nfs_vfsops.c 2015/11/04 17:32:00 1.229.2.1
+++ src/sys/nfs/nfs_vfsops.c 2015/11/08 01:14:20 1.229.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: nfs_vfsops.c,v 1.229.2.1 2015/11/04 17:32:00 riz Exp $ */ 1/* $NetBSD: nfs_vfsops.c,v 1.229.2.2 2015/11/08 01:14:20 riz Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1989, 1993, 1995 4 * Copyright (c) 1989, 1993, 1995
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Rick Macklem at The University of Guelph. 8 * Rick Macklem at The University of Guelph.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -25,27 +25,27 @@ @@ -25,27 +25,27 @@
25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 * 33 *
34 * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 34 * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
35 */ 35 */
36 36
37#include <sys/cdefs.h> 37#include <sys/cdefs.h>
38__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.229.2.1 2015/11/04 17:32:00 riz Exp $"); 38__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.229.2.2 2015/11/08 01:14:20 riz Exp $");
39 39
40#if defined(_KERNEL_OPT) 40#if defined(_KERNEL_OPT)
41#include "opt_nfs.h" 41#include "opt_nfs.h"
42#endif 42#endif
43 43
44#include <sys/param.h> 44#include <sys/param.h>
45#include <sys/ioctl.h> 45#include <sys/ioctl.h>
46#include <sys/signal.h> 46#include <sys/signal.h>
47#include <sys/proc.h> 47#include <sys/proc.h>
48#include <sys/namei.h> 48#include <sys/namei.h>
49#include <sys/device.h> 49#include <sys/device.h>
50#include <sys/vnode.h> 50#include <sys/vnode.h>
51#include <sys/kernel.h> 51#include <sys/kernel.h>
@@ -1159,14 +1159,15 @@ nfs_vfs_init(void) @@ -1159,14 +1159,15 @@ nfs_vfs_init(void)
1159 /* Initialize the iod structures */ 1159 /* Initialize the iod structures */
1160 nfs_iodinit(); 1160 nfs_iodinit();
1161 1161
1162 nfs_commitsize = uvmexp.npages << (PAGE_SHIFT - 4); 1162 nfs_commitsize = uvmexp.npages << (PAGE_SHIFT - 4);
1163} 1163}
1164 1164
1165void 1165void
1166nfs_vfs_done(void) 1166nfs_vfs_done(void)
1167{ 1167{
1168 1168
1169 nfs_node_done(); 1169 nfs_node_done();
1170 nfs_kqfini(); 1170 nfs_kqfini();
1171 nfs_iodfini(); 1171 nfs_iodfini();
 1172 nfs_fini();
1172} 1173}