53c53
< __FBSDID("$FreeBSD: head/sys/geom/geom_ccd.c 157581 2006-04-07 16:19:48Z marcel $");
---
> __FBSDID("$FreeBSD: head/sys/geom/geom_ccd.c 157740 2006-04-13 20:35:31Z cracauer $");
74a75,76
> #define CCDF_NO_OFFSET 0x08 /* do not leave space in front */
> #define CCDF_LINUX 0x10 /* use Linux compatibility mode */
138a141
> u_int32_t sc_offset; /* actual offset used */
217a221,234
>
> if (cs->sc_flags & CCDF_LINUX) {
> cs->sc_offset = 0;
> cs->sc_ileave *= 2;
> if (cs->sc_flags & CCDF_MIRROR && cs->sc_ndisks != 2)
> gctl_error(req, "Mirror mode for Linux raids is "
> "only supported with 2 devices");
> } else {
> if (cs->sc_flags & CCDF_NO_OFFSET)
> cs->sc_offset = 0;
> else
> cs->sc_offset = CCD_OFFSET;
>
> }
225c242
< size = mediasize / DEV_BSIZE - CCD_OFFSET;
---
> size = mediasize / DEV_BSIZE - cs->sc_offset;
607c624
< cbp->bio_offset = dbtob(cbn + cboff + CCD_OFFSET);
---
> cbp->bio_offset = dbtob(cbn + cboff + cs->sc_offset);
742a760,764
> if (gctl_get_param(req, "no_offset", NULL))
> sc->sc_flags |= CCDF_NO_OFFSET;
> if (gctl_get_param(req, "linux", NULL))
> sc->sc_flags |= CCDF_LINUX;
>