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

Fix scsi_da's BIO_DELETE->SCSI_UNMAP translation to use correct local

Browse Source 
variable when determining various sizes related to SCSI UNMAP block
descriptor lists.

Sponsored by:	Intel
Reviewed by:	mav
MFC after:	3 days
This commit is contained in:
Jim Harris 2012-08-24 17:08:02 +00:00
parent beaded8a1e
commit 3ae17a4ed8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cam/scsi/scsi_da.c
View File

@ -1849,8 +1849,8 @@ dastart(struct cam_periph *periph, union ccb *start_ccb)
softc->params.secsize > softc->unmap_max_lba) softc->params.secsize > softc->unmap_max_lba)
break; break;
} while (1); } while (1);
scsi_ulto2b(count * 16 + 6, &buf[0]); scsi_ulto2b(ranges * 16 + 6, &buf[0]);
scsi_ulto2b(count * 16, &buf[2]); scsi_ulto2b(ranges * 16, &buf[2]);
scsi_unmap(&start_ccb->csio, scsi_unmap(&start_ccb->csio,
/*retries*/da_retry_count, /*retries*/da_retry_count,
@ -1858,7 +1858,7 @@ dastart(struct cam_periph *periph, union ccb *start_ccb)
/*tag_action*/MSG_SIMPLE_Q_TAG, /*tag_action*/MSG_SIMPLE_Q_TAG,
/*byte2*/0, /*byte2*/0,
/*data_ptr*/ buf, /*data_ptr*/ buf,
/*dxfer_len*/ count * 16 + 8, /*dxfer_len*/ ranges * 16 + 8,
/*sense_len*/SSD_FULL_SIZE, /*sense_len*/SSD_FULL_SIZE,
da_default_timeout * 1000); da_default_timeout * 1000);
start_ccb->ccb_h.ccb_state = DA_CCB_DELETE; start_ccb->ccb_h.ccb_state = DA_CCB_DELETE;