upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix several bugs related to subdisk drive_offset calculation.

Browse source
This commit is contained in:
Lukas Ertl 2004-06-15 20:56:25 +00:00
parent b90e600892
commit da8f1aa53d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/geom/vinum/geom_vinum_subr.c
View file

@ -467,7 +467,7 @@ gv_sd_to_drive(struct gv_softc *sc, struct gv_drive *d, struct gv_sd *s,
if (s->size == -1) {
/* Find the largest available slot. */
LIST_FOREACH(fl, &d->freelist, freelist) {
if (fl->size > s->size) {
if (fl->size >= s->size) {
s->size = fl->size;
s->drive_offset = fl->offset;
fl2 = fl;
@ -490,8 +490,9 @@ gv_sd_to_drive(struct gv_softc *sc, struct gv_drive *d, struct gv_sd *s,
/* Yes, this subdisk fits. */
if (fl->size >= s->size) {
i++;
/* Override drive_offset, if given. */
s->drive_offset = fl->offset;
/* Assign drive offset, if not given. */
if (s->drive_offset == -1)
s->drive_offset = fl->offset;
fl2 = fl;
break;
}
@ -517,7 +518,7 @@ gv_sd_to_drive(struct gv_softc *sc, struct gv_drive *d, struct gv_sd *s,
* If there are no other subdisks yet, then set the default
* offset to GV_DATA_START.
*/
if (s->drive_offset == 0)
if (s->drive_offset == -1)
s->drive_offset = GV_DATA_START;
/* Check if we have a free slot at the given drive offset. */