From a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 19 Feb 2003 05:47:46 +0000 Subject: Back out M_* changes, per decision of the TRB. Approved by: trb --- sys/fs/devfs/devfs_rule.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/fs/devfs/devfs_rule.c') diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 1da70197db3a..e6802024617f 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); -- cgit v1.3