aboutsummaryrefslogtreecommitdiff
path: root/sys/geom/geom_slice.c
diff options
context:
space:
mode:
authorAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
committerAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
commit44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch)
treef16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/geom/geom_slice.c
parent1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff)
downloadsrc-44956c9863dc03344b03bdf6a83acf4e743f8e50.tar.gz
src-44956c9863dc03344b03bdf6a83acf4e743f8e50.zip
Notes
Diffstat (limited to 'sys/geom/geom_slice.c')
-rw-r--r--sys/geom/geom_slice.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index c097e7f0a694..e5aaf0f5fa5f 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_WAITOK | M_ZERO);
- gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO);
+ gsp = g_malloc(sizeof *gsp, M_ZERO);
+ gsp->softc = g_malloc(scsize, M_ZERO);
gsp->slices = g_malloc(nslice * sizeof(struct g_slice),
- M_WAITOK | M_ZERO);
+ M_ZERO);
gsp->nslice = nslice;
return (gsp);
}
@@ -371,7 +371,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_WAITOK | M_ZERO);
+ gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_ZERO);
if (gsp->hot != NULL)
bcopy(gsp->hot, gsl2, gsp->nhot * sizeof *gsl2);
gsp->hot = gsl2;