From 9d8236625502d9aebd87ee4b8aa759eb7dd062ae Mon Sep 17 00:00:00 2001 From: David Gwynne Date: Thu, 15 Sep 2016 02:00:19 +0000 Subject: 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); --- sys/tmpfs/tmpfs_vfsops.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'sys/tmpfs/tmpfs_vfsops.c') diff --git a/sys/tmpfs/tmpfs_vfsops.c b/sys/tmpfs/tmpfs_vfsops.c index 9197b0268d8..7c2ddd5b530 100644 --- a/sys/tmpfs/tmpfs_vfsops.c +++ b/sys/tmpfs/tmpfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmpfs_vfsops.c,v 1.11 2016/08/23 04:28:18 dlg Exp $ */ +/* $OpenBSD: tmpfs_vfsops.c,v 1.12 2016/09/15 02:00:18 dlg Exp $ */ /* $NetBSD: tmpfs_vfsops.c,v 1.52 2011/09/27 01:10:43 christos Exp $ */ /* @@ -73,12 +73,10 @@ int tmpfs_init(struct vfsconf *vfsp) { - pool_init(&tmpfs_dirent_pool, sizeof(tmpfs_dirent_t), 0, 0, PR_WAITOK, - "tmpfs_dirent", NULL); - pool_setipl(&tmpfs_dirent_pool, IPL_NONE); - pool_init(&tmpfs_node_pool, sizeof(tmpfs_node_t), 0, 0, PR_WAITOK, - "tmpfs_node", NULL); - pool_setipl(&tmpfs_node_pool, IPL_NONE); + pool_init(&tmpfs_dirent_pool, sizeof(tmpfs_dirent_t), 0, IPL_NONE, + PR_WAITOK, "tmpfs_dirent", NULL); + pool_init(&tmpfs_node_pool, sizeof(tmpfs_node_t), 0, IPL_NONE, + PR_WAITOK, "tmpfs_node", NULL); return 0; } -- cgit v1.2.3