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

Fix a panic if MD devices were left half-created.

Browse Source 
XXX: the real bug is that devstat isn't part of the disk minilayer.

PR:		27158
Submitted by:	Anders Nordby <anders@fix.no>
This commit is contained in:
phk 2001-05-06 17:17:23 +00:00
parent 57a9b2a27d
commit c6636108b5
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/md/md.c
View File

@ -519,17 +519,6 @@ mdnew(int unit)
return (sc);
}
static void
mddelete(struct md_s *sc)
{
devstat_remove_entry(&sc->stats);
/* XXX: LOCK(unique unit numbers) */
LIST_REMOVE(sc, list);
/* XXX: UNLOCK(unique unit numbers) */
FREE(sc, M_MD);
}
static void
mdinit(struct md_s *sc)
{
@ -721,8 +710,10 @@ mddestroy(struct md_s *sc, struct md_ioctl *mdio, struct proc *p)
{
unsigned u;
if (sc->dev != NULL)
if (sc->dev != NULL) {
devstat_remove_entry(&sc->stats);
disk_destroy(sc->dev);
}
if (sc->vnode != NULL)
(void)vn_close(sc->vnode, sc->flags & MD_READONLY ? FREAD : (FREAD|FWRITE), sc->cred, p);
if (sc->cred != NULL)
@ -735,7 +726,11 @@ mddestroy(struct md_s *sc, struct md_ioctl *mdio, struct proc *p)
FREE(sc->secp[u], M_MDSECT);
FREE(sc->secp, M_MD);
}
mddelete(sc);
/* XXX: LOCK(unique unit numbers) */
LIST_REMOVE(sc, list);
/* XXX: UNLOCK(unique unit numbers) */
FREE(sc, M_MD);
return (0);
}
@ -761,8 +756,10 @@ mdcreate_swap(struct md_ioctl *mdio, struct proc *p)
* size of a page. Then round to a page.
*/
if (mdio->md_size == 0)
if (mdio->md_size == 0) {
mddestroy(sc, mdio, p);
return(EDOM);
}
/*
* Allocate an OBJT_SWAP object.
@ -780,6 +777,7 @@ mdcreate_swap(struct md_ioctl *mdio, struct proc *p)
if (swap_pager_reserve(sc->object, 0, sc->nsect) < 0) {
vm_pager_deallocate(sc->object);
sc->object = NULL;
mddestroy(sc, mdio, p);
return(EDOM);
}
}