diff options
| author | pjd <pjd@FreeBSD.org> | 2004-07-26 15:35:04 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2004-07-26 15:35:04 +0000 |
| commit | 4a150a7afeaa7d867222ed5b0c588cdc6705a7eb (patch) | |
| tree | 905076cc7c0097ea69362b8bba15dacb8618805d /sys/geom/concat/g_concat.c | |
| parent | 4cf0522899584cb012761c4ba10b1f8cbc04d8b9 (diff) | |
| download | FreeBSD-src-4a150a7afeaa7d867222ed5b0c588cdc6705a7eb.zip FreeBSD-src-4a150a7afeaa7d867222ed5b0c588cdc6705a7eb.tar.gz | |
M_WAITOK is ok here, while I'm using M_WAITOK later in this function.
Diffstat (limited to 'sys/geom/concat/g_concat.c')
| -rw-r--r-- | sys/geom/concat/g_concat.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index 323484c..c610684 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -450,14 +450,7 @@ g_concat_create(struct g_class *mp, const struct g_concat_metadata *md, gp = g_new_geomf(mp, "%s.concat", md->md_name); gp->softc = NULL; /* for a moment */ - sc = malloc(sizeof(*sc), M_CONCAT, M_NOWAIT | M_ZERO); - if (sc == NULL) { - G_CONCAT_DEBUG(0, "Can't allocate memory for device %s.", - gp->name); - g_destroy_geom(gp); - return (NULL); - } - + sc = malloc(sizeof(*sc), M_CONCAT, M_WAITOK | M_ZERO); gp->start = g_concat_start; gp->spoiled = g_concat_orphan; gp->orphan = g_concat_orphan; |
