diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 16 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 5 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_dirhash.c | 3 |
4 files changed, 24 insertions, 4 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c index c518338b546..12a09b23565 100644 --- a/sys/ufs/ext2fs/ext2fs_vfsops.c +++ b/sys/ufs/ext2fs/ext2fs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vfsops.c,v 1.91 2016/05/22 20:27:04 bluhm Exp $ */ +/* $OpenBSD: ext2fs_vfsops.c,v 1.92 2016/06/19 10:21:56 dlg Exp $ */ /* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */ /* @@ -95,8 +95,10 @@ ext2fs_init(struct vfsconf *vfsp) { pool_init(&ext2fs_inode_pool, sizeof(struct inode), 0, 0, PR_WAITOK, "ext2inopl", NULL); + pool_setipl(&ext2fs_inode_pool, IPL_NONE); pool_init(&ext2fs_dinode_pool, sizeof(struct ext2fs_dinode), 0, 0, PR_WAITOK, "ext2dinopl", NULL); + pool_setipl(&ext2fs_dinode_pool, IPL_NONE); return (ufs_init(vfsp)); } diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 02a0e9ed8a5..ba017b87717 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_softdep.c,v 1.132 2016/03/19 12:04:16 natano Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.133 2016/06/19 10:21:56 dlg Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -1177,32 +1177,46 @@ softdep_initialize(void) timeout_set(&proc_waiting_timeout, pause_timer, NULL); pool_init(&pagedep_pool, sizeof(struct pagedep), 0, 0, PR_WAITOK, "pagedep", NULL); + pool_setipl(&pagedep_pool, IPL_NONE); pool_init(&inodedep_pool, sizeof(struct inodedep), 0, 0, PR_WAITOK, "inodedep", NULL); + pool_setipl(&inodedep_pool, IPL_NONE); pool_init(&newblk_pool, sizeof(struct newblk), 0, 0, PR_WAITOK, "newblk", NULL); + pool_setipl(&newblk_pool, IPL_NONE); pool_init(&bmsafemap_pool, sizeof(struct bmsafemap), 0, 0, PR_WAITOK, "bmsafemap", NULL); + pool_setipl(&bmsafemap_pool, IPL_NONE); pool_init(&allocdirect_pool, sizeof(struct allocdirect), 0, 0, PR_WAITOK, "allocdir", NULL); + pool_setipl(&allocdirect_pool, IPL_NONE); pool_init(&indirdep_pool, sizeof(struct indirdep), 0, 0, PR_WAITOK, "indirdep", NULL); + pool_setipl(&indirdep_pool, IPL_NONE); pool_init(&allocindir_pool, sizeof(struct allocindir), 0, 0, PR_WAITOK, "allocindir", NULL); + pool_setipl(&allocindir_pool, IPL_NONE); pool_init(&freefrag_pool, sizeof(struct freefrag), 0, 0, PR_WAITOK, "freefrag", NULL); + pool_setipl(&freefrag_pool, IPL_NONE); pool_init(&freeblks_pool, sizeof(struct freeblks), 0, 0, PR_WAITOK, "freeblks", NULL); + pool_setipl(&freeblks_pool, IPL_NONE); pool_init(&freefile_pool, sizeof(struct freefile), 0, 0, PR_WAITOK, "freefile", NULL); + pool_setipl(&freefile_pool, IPL_NONE); pool_init(&diradd_pool, sizeof(struct diradd), 0, 0, PR_WAITOK, "diradd", NULL); + pool_setipl(&diradd_pool, IPL_NONE); pool_init(&mkdir_pool, sizeof(struct mkdir), 0, 0, PR_WAITOK, "mkdir", NULL); + pool_setipl(&mkdir_pool, IPL_NONE); pool_init(&dirrem_pool, sizeof(struct dirrem), 0, 0, PR_WAITOK, "dirrem", NULL); + pool_setipl(&dirrem_pool, IPL_NONE); pool_init(&newdirblk_pool, sizeof(struct newdirblk), 0, 0, PR_WAITOK, "newdirblk", NULL); + pool_setipl(&newdirblk_pool, IPL_NONE); } /* diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 9ee397121b9..74fac9eed37 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.158 2016/05/23 09:31:28 natano Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.159 2016/06/19 10:21:56 dlg Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -1522,11 +1522,14 @@ ffs_init(struct vfsconf *vfsp) 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, PR_WAITOK, "dino1pl", NULL); + pool_setipl(&ffs_dinode1_pool, IPL_NONE); #ifdef FFS2 pool_init(&ffs_dinode2_pool, sizeof(struct ufs2_dinode), 0, 0, PR_WAITOK, "dino2pl", NULL); + pool_setipl(&ffs_dinode2_pool, IPL_NONE); #endif softdep_initialize(); diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c index 2fafaa1bef6..bb99f396eae 100644 --- a/sys/ufs/ufs/ufs_dirhash.c +++ b/sys/ufs/ufs/ufs_dirhash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_dirhash.c,v 1.36 2016/04/03 17:05:51 natano Exp $ */ +/* $OpenBSD: ufs_dirhash.c,v 1.37 2016/06/19 10:21:56 dlg Exp $ */ /* * Copyright (c) 2001, 2002 Ian Dowse. All rights reserved. * @@ -1049,6 +1049,7 @@ ufsdirhash_init(void) { pool_init(&ufsdirhash_pool, DH_NBLKOFF * sizeof(doff_t), 0, 0, PR_WAITOK, "dirhash", NULL); + pool_setipl(&ufsdirhash_pool, IPL_NONE); mtx_init(&ufsdirhash_mtx, IPL_NONE); arc4random_buf(&ufsdirhash_key, sizeof(ufsdirhash_key)); TAILQ_INIT(&ufsdirhash_list); |