diff options
Diffstat (limited to 'sys/cam/scsi/scsi_cd.c')
-rw-r--r-- | sys/cam/scsi/scsi_cd.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index c5be698..a187c79 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -1788,7 +1788,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) struct cd_mode_data *data; data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOCPLAYTRACKS\n")); @@ -1822,7 +1822,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) struct cd_mode_data *data; data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOCPLAYMSF\n")); @@ -1857,7 +1857,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCPLAYBLOCKS\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { @@ -1884,7 +1884,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCREADSUBCHANNEL\n")); data = malloc(sizeof(struct cd_sub_channel_info), - M_TEMP, M_WAITOK); + M_TEMP, 0); if ((len > sizeof(struct cd_sub_channel_info)) || (len < sizeof(struct cd_sub_channel_header))) { @@ -1928,7 +1928,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOREADTOCHEADER\n")); th = malloc(sizeof(struct ioc_toc_header), M_TEMP, - M_WAITOK); + 0); error = cdreadtoc(periph, 0, 0, (struct cd_toc_entry *)th, sizeof (*th)); @@ -1971,8 +1971,8 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOREADTOCENTRYS\n")); - data = malloc(sizeof(data_t), M_TEMP, M_WAITOK); - lead = malloc(sizeof(lead_t), M_TEMP, M_WAITOK); + data = malloc(sizeof(data_t), M_TEMP, 0); + lead = malloc(sizeof(lead_t), M_TEMP, 0); if (te->data_len < sizeof(struct cd_toc_entry) || (te->data_len % sizeof(struct cd_toc_entry)) != 0 @@ -2098,7 +2098,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOREADTOCENTRY\n")); - data = malloc(sizeof(data_t), M_TEMP, M_WAITOK); + data = malloc(sizeof(data_t), M_TEMP, 0); if (te->address_format != CD_MSF_FORMAT && te->address_format != CD_LBA_FORMAT) { @@ -2164,7 +2164,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCSETPATCH\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2189,7 +2189,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCGETVOL\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2213,7 +2213,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCSETVOL\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2239,7 +2239,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCSETMONO\n")); data = malloc(sizeof(struct cd_mode_data), - M_TEMP, M_WAITOK); + M_TEMP, 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2263,7 +2263,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCSETSTEREO\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2287,7 +2287,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCSETMUTE\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2309,7 +2309,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCSETLEFT\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2333,7 +2333,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) ("trying to do CDIOCSETRIGHT\n")); data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + 0); error = cdgetmode(periph, data, AUDIO_PAGE); if (error) { free(data, M_TEMP); @@ -2485,7 +2485,7 @@ cdsize(dev_t dev, u_int32_t *size) ccb = cdgetccb(periph, /* priority */ 1); rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), - M_TEMP, M_WAITOK); + M_TEMP, 0); scsi_read_capacity(&ccb->csio, /*retries*/ 1, @@ -3054,7 +3054,7 @@ cdreportkey(struct cam_periph *periph, struct dvd_authinfo *authinfo) } if (length != 0) { - databuf = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO); + databuf = malloc(length, M_DEVBUF, M_ZERO); } else databuf = NULL; @@ -3187,7 +3187,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo) length = sizeof(*challenge_data); - challenge_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO); + challenge_data = malloc(length, M_DEVBUF, M_ZERO); databuf = (u_int8_t *)challenge_data; @@ -3204,7 +3204,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo) length = sizeof(*key2_data); - key2_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO); + key2_data = malloc(length, M_DEVBUF, M_ZERO); databuf = (u_int8_t *)key2_data; @@ -3221,7 +3221,7 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo) length = sizeof(*rpc_data); - rpc_data = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO); + rpc_data = malloc(length, M_DEVBUF, M_ZERO); databuf = (u_int8_t *)rpc_data; @@ -3363,7 +3363,7 @@ cdreaddvdstructure(struct cam_periph *periph, struct dvd_struct *dvdstruct) } if (length != 0) { - databuf = malloc(length, M_DEVBUF, M_WAITOK | M_ZERO); + databuf = malloc(length, M_DEVBUF, M_ZERO); } else databuf = NULL; |