mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Free the container and sim objects on detach. Convert several uses of

Browse Source 
MALLOC to malloc.
This commit is contained in:
Scott Long 2003-02-06 00:37:37 +00:00
parent 5f54d52203
commit a761a1ca60
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=110428
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/aac/aac.c
View File

@ -401,8 +401,8 @@ aac_add_container(struct aac_softc *sc, struct aac_mntinforesp *mir, int f)
* the possible types may never show up. * the possible types may never show up.
*/ */
if ((mir->Status == ST_OK) && (mir->MntTable[0].VolType != CT_NONE)) { if ((mir->Status == ST_OK) && (mir->MntTable[0].VolType != CT_NONE)) {
MALLOC(co, struct aac_container *, sizeof *co, M_AACBUF, co = (struct aac_container *)malloc(sizeof *co, M_AACBUF,
M_NOWAIT); M_NOWAIT | M_ZERO);
if (co == NULL) if (co == NULL)
panic("Out of memory?!\n"); panic("Out of memory?!\n");
debug(1, "id %x name '%.16s' size %u type %d", debug(1, "id %x name '%.16s' size %u type %d",
@ -495,17 +495,21 @@ aac_detach(device_t dev)
return(EBUSY); return(EBUSY);
/* Remove the child containers */ /* Remove the child containers */
TAILQ_FOREACH(co, &sc->aac_container_tqh, co_link) { while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) {
TAILQ_REMOVE(&sc->aac_container_tqh, co, co_link);
error = device_delete_child(dev, co->co_disk); error = device_delete_child(dev, co->co_disk);
if (error) if (error)
return (error); return (error);
free(co, M_AACBUF);
} }
/* Remove the CAM SIMs */ /* Remove the CAM SIMs */
TAILQ_FOREACH(sim, &sc->aac_sim_tqh, sim_link) { while ((sim = TAILQ_FIRST(&sc->aac_sim_tqh)) != NULL) {
TAILQ_REMOVE(&sc->aac_sim_tqh, sim, sim_link);
error = device_delete_child(dev, sim->sim_dev); error = device_delete_child(dev, sim->sim_dev);
if (error) if (error)
return (error); return (error);
free(sim, M_AACBUF);
} }
if (sc->aifflags & AAC_AIFFLAGS_RUNNING) { if (sc->aifflags & AAC_AIFFLAGS_RUNNING) {
@ -2779,8 +2783,8 @@ aac_get_bus_info(struct aac_softc *sc)
if (businfo.BusValid[i] != AAC_BUS_VALID) if (businfo.BusValid[i] != AAC_BUS_VALID)
continue; continue;
MALLOC(caminf, struct aac_sim *, caminf = (struct aac_sim *)malloc( sizeof(struct aac_sim),
sizeof(struct aac_sim), M_AACBUF, M_NOWAIT | M_ZERO); M_AACBUF, M_NOWAIT | M_ZERO);
if (caminf == NULL) if (caminf == NULL)
continue; continue;