From: tedu <tedu@openbsd.org>
Date: Tue, 23 Dec 2014 01:55:03 +0000 (+0000)
Subject: change req pool alloc to null. add prwaitok here and nfs_node_pool which
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=53a296e09dacbc7758a52db8a91c865c1d49d0cd;p=openbsd

change req pool alloc to null. add prwaitok here and nfs_node_pool which
is also sleeping in all callers, but already used null
---

diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index bd60a8f85be..0354a64e635 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_subs.c,v 1.121 2014/12/18 21:00:12 tedu Exp $	*/
+/*	$OpenBSD: nfs_subs.c,v 1.122 2014/12/23 01:55:03 tedu Exp $	*/
 /*	$NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $	*/
 
 /*
@@ -897,8 +897,8 @@ nfs_init(void)
 	nfsrv_initcache();		/* Init the server request cache */
 #endif /* NFSSERVER */
 
-	pool_init(&nfsreqpl, sizeof(struct nfsreq), 0, 0, 0, "nfsreqpl",
-	    &pool_allocator_nointr);
+	pool_init(&nfsreqpl, sizeof(struct nfsreq), 0, 0, PR_WAITOK,
+	    "nfsreqpl", NULL);
 }
 
 #ifdef NFSCLIENT
@@ -909,7 +909,7 @@ nfs_vfs_init(struct vfsconf *vfsp)
 
 	TAILQ_INIT(&nfs_bufq);
 
-	pool_init(&nfs_node_pool, sizeof(struct nfsnode), 0, 0, 0,
+	pool_init(&nfs_node_pool, sizeof(struct nfsnode), 0, 0, PR_WAITOK,
 	    "nfsnodepl", NULL);
 
 	return (0);