diff options
| author | phk <phk@FreeBSD.org> | 2003-05-02 06:42:59 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-05-02 06:42:59 +0000 |
| commit | 055cf65eb1d06904d69d4b58914213644ad8cb0d (patch) | |
| tree | bb8126af9ed3864ba67d3f80bced0b3ac8d831ee /sys/geom/geom_io.c | |
| parent | 9bb7fb74d1c16b096bf1753ef0429c85eb933304 (diff) | |
| download | FreeBSD-src-055cf65eb1d06904d69d4b58914213644ad8cb0d.zip FreeBSD-src-055cf65eb1d06904d69d4b58914213644ad8cb0d.tar.gz | |
Back out all the stuff that didn't belong in the last commit.
Diffstat (limited to 'sys/geom/geom_io.c')
| -rw-r--r-- | sys/geom/geom_io.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 12d75f8..e325ecd 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -109,8 +109,6 @@ g_bioq_enqueue_tail(struct bio *bp, struct g_bioq *rq) g_bioq_unlock(rq); } -MALLOC_DEFINE(M_GEOMBIO, "GEOM bio", "Geom bio"); - struct bio * g_new_bio(void) { @@ -120,7 +118,7 @@ g_new_bio(void) bp = g_bioq_first(&g_bio_idle); g_bioq_unlock(&g_bio_idle); if (bp == NULL) - bp = malloc(sizeof *bp, M_GEOMBIO, M_NOWAIT | M_ZERO); + bp = g_malloc(sizeof *bp, M_NOWAIT | M_ZERO); /* g_trace(G_T_BIO, "g_new_bio() = %p", bp); */ return (bp); } @@ -129,13 +127,9 @@ void g_destroy_bio(struct bio *bp) { -#if 0 /* g_trace(G_T_BIO, "g_destroy_bio(%p)", bp); */ bzero(bp, sizeof *bp); g_bioq_enqueue_tail(bp, &g_bio_idle); -#else - free(bp, M_GEOMBIO); -#endif } struct bio * |
