M_WAITOK is ok here, while I'm using M_WAITOK later in this function.
This commit is contained in:
parent
f901ebcfb6
commit
75cc259de8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=132661
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user