diff options
author | David Gwynne <dlg@cvs.openbsd.org> | 2016-09-15 02:00:19 +0000 |
---|---|---|
committer | David Gwynne <dlg@cvs.openbsd.org> | 2016-09-15 02:00:19 +0000 |
commit | 9d8236625502d9aebd87ee4b8aa759eb7dd062ae (patch) | |
tree | 608f67fdaff3caceaeb03f449b57d21037a3fe79 /sys/ufs/ffs/ffs_vfsops.c | |
parent | 2470899b803a7fb5d135883edd5ddd82d6a592c7 (diff) |
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);
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
-rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 79f9803cd52..99eaf527aac 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.163 2016/09/07 17:30:13 natano Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.164 2016/09/15 02:00:18 dlg Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -1490,16 +1490,13 @@ ffs_init(struct vfsconf *vfsp) done = 1; - pool_init(&ffs_ino_pool, sizeof(struct inode), 0, 0, PR_WAITOK, - "ffsino", NULL); - pool_setipl(&ffs_ino_pool, IPL_NONE); - pool_init(&ffs_dinode1_pool, sizeof(struct ufs1_dinode), 0, 0, + pool_init(&ffs_ino_pool, sizeof(struct inode), 0, IPL_NONE, + PR_WAITOK, "ffsino", NULL); + pool_init(&ffs_dinode1_pool, sizeof(struct ufs1_dinode), 0, IPL_NONE, PR_WAITOK, "dino1pl", NULL); - pool_setipl(&ffs_dinode1_pool, IPL_NONE); #ifdef FFS2 - pool_init(&ffs_dinode2_pool, sizeof(struct ufs2_dinode), 0, 0, + pool_init(&ffs_dinode2_pool, sizeof(struct ufs2_dinode), 0, IPL_NONE, PR_WAITOK, "dino2pl", NULL); - pool_setipl(&ffs_dinode2_pool, IPL_NONE); #endif softdep_initialize(); |