summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2011-06-21 04:46:00 +0000
committerdelphij <delphij@FreeBSD.org>2011-06-21 04:46:00 +0000
commitd740ec2e3548be76883ec841b23261317085d6ba (patch)
treec5bf68db62922a655636cc65f13382eda2b1db19 /sbin
parent8e166a461cb07c7f1e283eaeb4013edcaaccad09 (diff)
downloadFreeBSD-src-d740ec2e3548be76883ec841b23261317085d6ba.zip
FreeBSD-src-d740ec2e3548be76883ec841b23261317085d6ba.tar.gz
Mod the offset padding by alignment. Without this change we may
pad too much when underlying GEOM object have a zero stripesize. MFC after: 1 month
Diffstat (limited to 'sbin')
-rw-r--r--sbin/geom/class/part/geom_part.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/geom/class/part/geom_part.c b/sbin/geom/class/part/geom_part.c
index a6840e2..389c274 100644
--- a/sbin/geom/class/part/geom_part.c
+++ b/sbin/geom/class/part/geom_part.c
@@ -362,7 +362,7 @@ gpart_autofill_resize(struct gctl_req *req)
goto done;
}
- offset = pp->lg_stripeoffset / pp->lg_sectorsize;
+ offset = (pp->lg_stripeoffset / pp->lg_sectorsize) % alignment;
last = (off_t)strtoimax(find_geomcfg(gp, "last"), NULL, 0);
LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
s = find_provcfg(pp, "index");
@@ -497,7 +497,7 @@ gpart_autofill(struct gctl_req *req)
alignment = len;
/* Adjust parameters to stripeoffset */
- offset = pp->lg_stripeoffset / pp->lg_sectorsize;
+ offset = (pp->lg_stripeoffset / pp->lg_sectorsize) % alignment;
start = ALIGNUP(start + offset, alignment);
if (size > alignment)
size = ALIGNDOWN(size, alignment);
OpenPOWER on IntegriCloud