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

Add debug calls to catch occasional deadlocks on drives. The problem

Browse Source 
is probably gone, but the debug checks remain for a while.

update_plex_config: Catch yet another divide-by-zero problem when
		    detaching the last subdisk from a striped plex.

Uncovered-by: Michael Reifenberger <root@nihil.plaut.de>
This commit is contained in:
Greg Lehey 1999-04-10 08:08:45 +00:00
parent 42d21b86b2
commit ec3a729692
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/dev/vinum/vinumconfig.c
View File

@ -590,7 +590,7 @@ void
free_drive(struct drive *drive)
{
if (drive->state > drive_referenced) { /* real drive */
lockdrive(drive);
LOCKDRIVE(drive);
if (drive->vp != NULL) /* device open */
vn_close(drive->vp, FREAD | FWRITE, FSCRED, drive->p);
if (drive->freelist)
@ -1827,20 +1827,25 @@ update_plex_config(int plexno, int diskconfig)
* of each subdisk and return it to the drive.
*/
if (plex->length > 0) {
remainder = (int) (plex->length % ((u_int64_t) plex->stripesize * data_sds)); /* are we exact? */
if (remainder) { /* no */
log(LOG_INFO, "vinum: removing %d blocks of partial stripe at the end of %s\n",
remainder,
plex->name);
plex->length -= remainder; /* shorten the plex */
remainder /= data_sds; /* spread the remainder amongst the sds */
for (sdno = 0; sdno < plex->subdisks; sdno++) {
sd = &SD[plex->sdnos[sdno]]; /* point to the subdisk */
return_drive_space(sd->driveno, /* return the space */
sd->driveoffset + sd->sectors - remainder,
remainder);
sd->sectors -= remainder; /* and shorten it */
}
if (data_sds > 0) {
if (plex->stripesize > 0) {
remainder = (int) (plex->length % ((u_int64_t) plex->stripesize * data_sds)); /* are we exact? */
if (remainder) { /* no */
log(LOG_INFO, "vinum: removing %d blocks of partial stripe at the end of %s\n",
remainder,
plex->name);
plex->length -= remainder; /* shorten the plex */
remainder /= data_sds; /* spread the remainder amongst the sds */
for (sdno = 0; sdno < plex->subdisks; sdno++) {
sd = &SD[plex->sdnos[sdno]]; /* point to the subdisk */
return_drive_space(sd->driveno, /* return the space */
sd->driveoffset + sd->sectors - remainder,
remainder);
sd->sectors -= remainder; /* and shorten it */
}
}
} else /* no data sds, */
plex->length = 0; /* reset length */
}
}
}