From e297897fd5d13f09336333d4631957f9748b6f82 Mon Sep 17 00:00:00 2001 From: dlg Date: Tue, 30 Aug 2016 07:12:49 +0000 Subject: [PATCH] pool_setipl for nfs pools ok natano@ --- sys/nfs/nfs_subs.c | 4 +++- sys/nfs/nfs_syscalls.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 35ad17e64fb..bfd5e88fcec 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.131 2016/04/29 14:40:36 beck Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.132 2016/08/30 07:12:49 dlg Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -899,6 +899,7 @@ nfs_init(void) pool_init(&nfsreqpl, sizeof(struct nfsreq), 0, 0, PR_WAITOK, "nfsreqpl", NULL); + pool_setipl(&nfsreqpl, IPL_NONE); } #ifdef NFSCLIENT @@ -911,6 +912,7 @@ nfs_vfs_init(struct vfsconf *vfsp) pool_init(&nfs_node_pool, sizeof(struct nfsnode), 0, 0, PR_WAITOK, "nfsnodepl", NULL); + pool_setipl(&nfs_node_pool, IPL_NONE); return (0); } diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index fabdb4e64ee..2c3473298d0 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_syscalls.c,v 1.104 2015/09/04 11:50:33 kettenis Exp $ */ +/* $OpenBSD: nfs_syscalls.c,v 1.105 2016/08/30 07:12:49 dlg Exp $ */ /* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */ /* @@ -545,9 +545,11 @@ nfsrv_init(int terminating) M_WAITOK|M_ZERO); TAILQ_INSERT_HEAD(&nfssvc_sockhead, nfs_udpsock, ns_chain); - if (!terminating) + if (!terminating) { pool_init(&nfsrv_descript_pl, sizeof(struct nfsrv_descript), 0, 0, PR_WAITOK, "ndscpl", NULL); + pool_setipl(&nfsrv_descript_pl, IPL_NONE); + } } #endif /* NFSSERVER */ -- 2.20.1