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_slice.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_slice.c')
| -rw-r--r-- | sys/geom/geom_slice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c index 43fbc5f..0a23751 100644 --- a/sys/geom/geom_slice.c +++ b/sys/geom/geom_slice.c @@ -71,10 +71,10 @@ g_slice_init(unsigned nslice, unsigned scsize) { struct g_slicer *gsp; - gsp = g_malloc(sizeof *gsp, M_ZERO); - gsp->softc = g_malloc(scsize, M_ZERO); + gsp = g_malloc(sizeof *gsp, M_WAITOK | M_ZERO); + gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO); gsp->slices = g_malloc(nslice * sizeof(struct g_slice), - M_ZERO); + M_WAITOK | M_ZERO); gsp->nslice = nslice; return (gsp); } @@ -377,7 +377,7 @@ g_slice_conf_hot(struct g_geom *gp, u_int idx, off_t offset, off_t length) gsp = gp->softc; gsl = gsp->hot; if(idx >= gsp->nhot) { - gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_ZERO); + gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_WAITOK | M_ZERO); if (gsp->hot != NULL) bcopy(gsp->hot, gsl2, gsp->nhot * sizeof *gsl2); gsp->hot = gsl2; |
