all pools have their ipl set via pool_setipl, so fold it into pool_init.

the ioff argument to pool_init() is unused and has been for many
years, so this replaces it with an ipl argument. because the ipl
will be set on init we no longer need pool_setipl.

most of these changes have been done with coccinelle using the spatch
below. cocci sucks at formatting code though, so i fixed that by hand.

the manpage and subr_pool.c bits i did myself.

ok tedu@ jmatthew@

@ipl@
expression pp;
expression ipl;
expression s, a, o, f, m, p;
@@
-pool_init(pp, s, a, o, f, m, p);
-pool_setipl(pp, ipl);
+pool_init(pp, s, a, ipl, f, m, p);

1 files changed, 5 insertions, 6 deletions

diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 9f89572a872..65592765546 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.158 2016/09/13 07:50:36 mpi Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.159 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -92,12 +92,11 @@ struct taskq *sosplice_taskq;
 void
 soinit(void)
 {
-	pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0, "sockpl", NULL);
-	pool_setipl(&socket_pool, IPL_SOFTNET);
+	pool_init(&socket_pool, sizeof(struct socket), 0, IPL_SOFTNET, 0,
+	    "sockpl", NULL);
 #ifdef SOCKET_SPLICE
-	pool_init(&sosplice_pool, sizeof(struct sosplice), 0, 0, 0, "sosppl",
-	    NULL);
-	pool_setipl(&sosplice_pool, IPL_SOFTNET);
+	pool_init(&sosplice_pool, sizeof(struct sosplice), 0, IPL_SOFTNET, 0,
+	    "sosppl", NULL);
 #endif
 }