diff options
| author | Scott Long <scottl@FreeBSD.org> | 2007-12-02 19:54:45 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2007-12-02 19:54:45 +0000 |
| commit | cdc03cc897d6c95a798fff39130f490c83dc0112 (patch) | |
| tree | ebc530485fa7de26b51ed0e3fd3a0867a4b16042 /sys/dev/amr/amr_cam.c | |
| parent | f4b5c2581d738dc31aec4124a0daba19f057189b (diff) | |
Notes
Diffstat (limited to 'sys/dev/amr/amr_cam.c')
| -rw-r--r-- | sys/dev/amr/amr_cam.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c index d5af398d8ff4..9ad465ed2dad 100644 --- a/sys/dev/amr/amr_cam.c +++ b/sys/dev/amr/amr_cam.c @@ -86,6 +86,7 @@ static void amr_cam_action(struct cam_sim *sim, union ccb *ccb); static void amr_cam_poll(struct cam_sim *sim); static void amr_cam_complete(struct amr_command *ac); +MALLOC_DEFINE(M_AMRCAM, "amrcam", "AMR CAM memory"); /*********************************************************************** * Enqueue/dequeue functions @@ -406,7 +407,7 @@ amr_cam_command(struct amr_softc *sc, struct amr_command **acp) /* construct passthrough */ if (sc->support_ext_cdb ) { - if ((aep = malloc(sizeof(*aep), M_DEVBUF, M_NOWAIT | M_ZERO)) + if ((aep = malloc(sizeof(*aep), M_AMRCAM, M_NOWAIT | M_ZERO)) == NULL) { error = ENOMEM; goto out; @@ -436,7 +437,7 @@ amr_cam_command(struct amr_softc *sc, struct amr_command **acp) aep->ap_scsi_id, aep->ap_logical_drive_no); } else { - if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_NOWAIT | M_ZERO)) + if ((ap = malloc(sizeof(*ap), M_AMRCAM, M_NOWAIT | M_ZERO)) == NULL) { error = ENOMEM; goto out; @@ -498,9 +499,9 @@ out: if (ac != NULL) amr_releasecmd(ac); if (ap != NULL) - free(ap, M_DEVBUF); + free(ap, M_AMRCAM); if (aep != NULL) - free(aep, M_DEVBUF); + free(aep, M_AMRCAM); if (csio != NULL) /* put it back and try again later */ amr_requeue_ccb(sc, (union ccb *)csio); @@ -595,9 +596,9 @@ amr_cam_complete(struct amr_command *ac) out: if (ac->ac_length == sizeof(*ap)) - free(ap, M_DEVBUF); + free(ap, M_AMRCAM); else - free(aep, M_DEVBUF); + free(aep, M_AMRCAM); if ((csio->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) debug(2, "%*D\n", imin(csio->dxfer_len, 16), csio->data_ptr, " "); |