svn commit: r201720 - stable/7/sys/dev/ata
Alexander Motin
mav at FreeBSD.org
Thu Jan 7 09:07:51 UTC 2010
Author: mav
Date: Thu Jan 7 09:07:51 2010
New Revision: 201720
URL: http://svn.freebsd.org/changeset/base/201720
Log:
MFC rev. 198487:
Round timeout up when converting CAM milliseconds to ATA seconds.
Modified:
stable/7/sys/dev/ata/atapi-cam.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/ata/atapi-cam.c
==============================================================================
--- stable/7/sys/dev/ata/atapi-cam.c Thu Jan 7 09:02:30 2010 (r201719)
+++ stable/7/sys/dev/ata/atapi-cam.c Thu Jan 7 09:07:51 2010 (r201720)
@@ -633,7 +633,7 @@ atapi_action(struct cam_sim *sim, union
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;
More information about the svn-src-stable-7
mailing list