diff options
| author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/fs/devfs/devfs_rule.c | |
| parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
| download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/fs/devfs/devfs_rule.c')
| -rw-r--r-- | sys/fs/devfs/devfs_rule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 1da7019..e680202 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -222,7 +222,7 @@ devfs_rules_ioctl(struct mount *mp, u_long cmd, caddr_t data, struct thread *td) error = ESRCH; goto out; } - dk = malloc(sizeof(*dk), M_TEMP, M_ZERO); + dk = malloc(sizeof(*dk), M_TEMP, M_WAITOK | M_ZERO); memcpy(&dk->dk_rule, dr, sizeof(*dr)); lockmgr(&dm->dm_lock, LK_UPGRADE, 0, td); devfs_rule_applydm(dk, dm); @@ -556,7 +556,7 @@ devfs_rule_insert(struct devfs_rule *dr) return (error); } - dk = malloc(sizeof(*dk), M_DEVFS, 0); + dk = malloc(sizeof(*dk), M_DEVFS, M_WAITOK); dk->dk_ruleset = ds; if (dsi != NULL) ++dsi->ds_refcount; @@ -749,7 +749,7 @@ devfs_ruleset_create(devfs_rsnum rsnum) KASSERT(devfs_ruleset_bynum(rsnum) == NULL, ("creating already existent ruleset %d", rsnum)); - ds = malloc(sizeof(*ds), M_DEVFS, M_ZERO); + ds = malloc(sizeof(*ds), M_DEVFS, M_WAITOK | M_ZERO); ds->ds_number = rsnum; ds->ds_refcount = ds->ds_flags = 0; SLIST_INIT(&ds->ds_rules); |
