MFC rev. 198487:

Round timeout up when converting CAM milliseconds to ATA seconds.
This commit is contained in:
Alexander Motin 2009-10-29 10:38:17 +00:00
parent 963069c15e
commit f39d3da87e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/stable/8/; revision=198578

View File

@ -635,7 +635,7 @@ atapi_action(struct cam_sim *sim, union ccb *ccb)
request->data = buf;
request->bytecount = len;
request->transfersize = min(request->bytecount, 65534);
request->timeout = ccb_h->timeout / 1000; /* XXX lost granularity */
request->timeout = (ccb_h->timeout + 999) / 1000;
request->callback = &atapi_cb;
request->flags = request_flags;
@ -738,7 +738,7 @@ atapi_cb(struct ata_request *request)
request->data = (caddr_t)&csio->sense_data;
request->bytecount = sizeof(struct atapi_sense);
request->transfersize = min(request->bytecount, 65534);
request->timeout = csio->ccb_h.timeout / 1000;
request->timeout = (csio->ccb_h.timeout + 999) / 1000;
request->retries = 2;
request->flags = ATA_R_QUIET|ATA_R_ATAPI|ATA_R_IMMEDIATE;
hcb->flags |= AUTOSENSE;