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/geom/geom_subr.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/geom/geom_subr.c')
-rw-r--r-- | sys/geom/geom_subr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index e2209fc..1b9c01e 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -100,9 +100,9 @@ g_new_geomf(struct g_class *mp, const char *fmt, ...) sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); sbuf_vprintf(sb, fmt, ap); sbuf_finish(sb); - gp = g_malloc(sizeof *gp, M_ZERO); + gp = g_malloc(sizeof *gp, M_WAITOK | M_ZERO); gp->protect = 0x020016601; - gp->name = g_malloc(sbuf_len(sb) + 1, M_ZERO); + gp->name = g_malloc(sbuf_len(sb) + 1, M_WAITOK | M_ZERO); gp->class = mp; gp->rank = 1; LIST_INIT(&gp->consumer); @@ -143,7 +143,7 @@ g_new_consumer(struct g_geom *gp) ("g_new_consumer on geom(%s) (class %s) without orphan", gp->name, gp->class->name)); - cp = g_malloc(sizeof *cp, M_ZERO); + cp = g_malloc(sizeof *cp, M_WAITOK | M_ZERO); cp->protect = 0x020016602; cp->geom = gp; cp->stat = g_stat_new(cp); @@ -179,7 +179,7 @@ g_new_providerf(struct g_geom *gp, const char *fmt, ...) sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); sbuf_vprintf(sb, fmt, ap); sbuf_finish(sb); - pp = g_malloc(sizeof *pp + sbuf_len(sb) + 1, M_ZERO); + pp = g_malloc(sizeof *pp + sbuf_len(sb) + 1, M_WAITOK | M_ZERO); pp->protect = 0x020016603; pp->name = (char *)(pp + 1); strcpy(pp->name, sbuf_data(sb)); @@ -684,7 +684,7 @@ g_idclass(struct geomidorname *p) return (mp); return (NULL); } - n = g_malloc(p->len + 1, 0); + n = g_malloc(p->len + 1, M_WAITOK); if (copyin(p->u.name, n, p->len) == 0) { n[p->len] = '\0'; LIST_FOREACH(mp, &g_classes, class) @@ -711,7 +711,7 @@ g_idgeom(struct geomidorname *p) return (gp); return (NULL); } - n = g_malloc(p->len + 1, 0); + n = g_malloc(p->len + 1, M_WAITOK); if (copyin(p->u.name, n, p->len) == 0) { n[p->len] = '\0'; LIST_FOREACH(mp, &g_classes, class) @@ -741,7 +741,7 @@ g_idprovider(struct geomidorname *p) return (pp); return (NULL); } - n = g_malloc(p->len + 1, 0); + n = g_malloc(p->len + 1, M_WAITOK); if (copyin(p->u.name, n, p->len) == 0) { n[p->len] = '\0'; LIST_FOREACH(mp, &g_classes, class) |