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_aes.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_aes.c')
| -rw-r--r-- | sys/geom/geom_aes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c index 5471cbf..72f0d3d 100644 --- a/sys/geom/geom_aes.c +++ b/sys/geom/geom_aes.c @@ -148,7 +148,7 @@ g_aes_read_done(struct bio *bp) gp = bp->bio_from->geom; sc = gp->softc; - sb = g_malloc(sc->sectorsize, 0); + sb = g_malloc(sc->sectorsize, M_WAITOK); b = bp->bio_data; e = bp->bio_data; e += bp->bio_length; @@ -211,7 +211,7 @@ g_aes_start(struct bio *bp) } bp2->bio_done = g_aes_write_done; bp2->bio_offset += sc->sectorsize; - bp2->bio_data = g_malloc(bp->bio_length, 0); + bp2->bio_data = g_malloc(bp->bio_length, M_WAITOK); b = bp->bio_data; e = bp->bio_data; e += bp->bio_length; @@ -322,7 +322,7 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) if (buf == NULL || error != 0) { break; } - sc = g_malloc(sizeof(struct g_aes_softc), M_ZERO); + sc = g_malloc(sizeof(struct g_aes_softc), M_WAITOK | M_ZERO); if (!memcmp(buf, aes_magic, strlen(aes_magic))) { sc->keying = KEY_ZERO; } else if (!memcmp(buf, aes_magic_random, |
