d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to get used to architectures which are picky about alignment.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2002-03-15 21:41:41 +00:00
parent 6774c4e510
commit 19f1d16d37
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/geom/geom_slice.c
View File

@ -67,8 +67,9 @@ g_slice_init(unsigned nslice, unsigned scsize)
gsp = g_malloc(sizeof *gsp + nslice * sizeof(struct g_slice) + scsize,
M_WAITOK | M_ZERO);
gsp->softc = gsp + 1;
gsp->slices = (struct g_slice *)((u_char *)gsp->softc + scsize);
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_WAITOK | M_ZERO);
gsp->nslice = nslice;
return (gsp);
}
@ -237,6 +238,7 @@ g_slice_new(struct g_method *mp, int slices, struct g_provider *pp, struct g_con
if (error) {
g_dettach(cp);
g_destroy_consumer(cp);
g_free(gsp->slices);
g_free(gp->softc);
g_destroy_geom(gp);
return (NULL);
@ -266,13 +268,4 @@ g_slice_orphan(struct g_consumer *cp, struct thread *tp __unused)
g_orphan_provider(pp, error);
return;
if (cp->biocount > 0)
return;
/* Then selfdestruct */
if (cp->acr != 0 || cp->acw != 0 || cp->ace != 0)
g_access_abs(cp, 0, 0, 0);
g_dettach(cp);
g_destroy_consumer(cp);
return;
}