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

Refinement on previous fix for mutex destruction: make sure we don't

Browse Source 
release the mutex multiple times for multi-plex volumes.

Following further consultation with:	grog
This commit is contained in:
Robert Watson 2002-10-05 03:33:38 +00:00
parent 96364d6806
commit 0c0d4e17e4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -726,7 +726,6 @@ return_drive_space(int driveno, int64_t offset, int length)
void
free_sd(int sdno)
{
struct plex *plex = &PLEX[sdno];
struct sd *sd;
sd = &SD[sdno];
@ -736,9 +735,7 @@ free_sd(int sdno)
sd->driveoffset,
sd->sectors);
if (sd->plexno >= 0)
plex->subdisks--; /* one less subdisk */
if (isstriped (plex))
mtx_destroy(&plex->lockmtx);
PLEX[sd->plexno].subdisks--; /* one less subdisk */
destroy_dev(sd->dev);
bzero(sd, sizeof(struct sd)); /* and clear it out */
sd->state = sd_unallocated;
@ -817,6 +814,8 @@ free_plex(int plexno)
Free(plex->sdnos);
if (plex->lock)
Free(plex->lock);
if (isstriped (plex))
mtx_destroy(&plex->lockmtx);
destroy_dev(plex->dev);
bzero(plex, sizeof(struct plex)); /* and clear it out */
plex->state = plex_unallocated;