diff options
| author | mav <mav@FreeBSD.org> | 2015-10-05 11:49:02 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-05 11:49:02 +0000 |
| commit | d0ad6bdc5ec19db36977ed4eeffe21f7461ee162 (patch) | |
| tree | 34a20cb558aa9bf9d4d3d3642b2f1f5bd2c9bd7e /sys/cam | |
| parent | d7b02ef70de1cfa8b23924cbaa2f1caf6dc6963c (diff) | |
| download | FreeBSD-src-d0ad6bdc5ec19db36977ed4eeffe21f7461ee162.zip FreeBSD-src-d0ad6bdc5ec19db36977ed4eeffe21f7461ee162.tar.gz | |
MFC r288450: Make zero WUT use WRITE SAME with recently allowed NDOB flag.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ctl/ctl_tpc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/cam/ctl/ctl_tpc.c b/sys/cam/ctl/ctl_tpc.c index 33c7db8..6aa2080 100644 --- a/sys/cam/ctl/ctl_tpc.c +++ b/sys/cam/ctl/ctl_tpc.c @@ -1295,7 +1295,6 @@ complete: ctl_free_io(tio->io); free(tio, M_CTL); } - free(list->buf, M_CTL); if (list->abort) { ctl_set_task_aborted(list->ctsio); return (CTL_RETVAL_ERROR); @@ -1311,7 +1310,6 @@ complete: } dstblock = list->lun->be_lun->blocksize; - list->buf = malloc(dstblock, M_CTL, M_WAITOK | M_ZERO); TAILQ_INIT(&run); prun = &run; list->tbdio = 1; @@ -1328,9 +1326,9 @@ complete: TAILQ_INSERT_TAIL(&list->allio, tiow, links); tiow->io = tpcl_alloc_io(); ctl_scsi_write_same(tiow->io, - /*data_ptr*/ list->buf, - /*data_len*/ dstblock, - /*byte2*/ 0, + /*data_ptr*/ NULL, + /*data_len*/ 0, + /*byte2*/ SWS_NDOB, /*lba*/ scsi_8btou64(list->range[r].lba), /*num_blocks*/ len, /*tag_type*/ CTL_TAG_SIMPLE, |
