diff options
| author | smh <smh@FreeBSD.org> | 2014-12-21 03:06:11 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2014-12-21 03:06:11 +0000 |
| commit | f73f068967977545d4d60b36864475974dca2613 (patch) | |
| tree | 25e0e0aad4faf12d9100173a8b5cb4866ec97cdf /sys/dev/isci/isci_io_request.c | |
| parent | 4ae371d305e8c60f2e534058d1727f819749b623 (diff) | |
| download | FreeBSD-src-f73f068967977545d4d60b36864475974dca2613.zip FreeBSD-src-f73f068967977545d4d60b36864475974dca2613.tar.gz | |
MFC r274819:
Prevent overflow issues in timeout processing
MFC r274852:
Fix build with asr driver
Sponsored by: Multiplay
Diffstat (limited to 'sys/dev/isci/isci_io_request.c')
| -rw-r--r-- | sys/dev/isci/isci_io_request.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/isci/isci_io_request.c b/sys/dev/isci/isci_io_request.c index d1f5afe..4151900 100644 --- a/sys/dev/isci/isci_io_request.c +++ b/sys/dev/isci/isci_io_request.c @@ -731,8 +731,9 @@ isci_io_request_construct(void *arg, bus_dma_segment_t *seg, int nseg, } if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) - callout_reset(&io_request->parent.timer, ccb->ccb_h.timeout, - isci_io_request_timeout, io_request); + callout_reset_sbt(&io_request->parent.timer, + SBT_1MS * ccb->ccb_h.timeout, 0, isci_io_request_timeout, + io_request, 0); } void @@ -983,7 +984,8 @@ isci_io_request_execute_smp_io(union ccb *ccb, } if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) - callout_reset(&io_request->parent.timer, ccb->ccb_h.timeout, - isci_io_request_timeout, request); + callout_reset_sbt(&io_request->parent.timer, + SBT_1MS * ccb->ccb_h.timeout, 0, isci_io_request_timeout, + request, 0); } #endif |
