summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authorsmh <smh@FreeBSD.org>2013-01-10 12:25:00 +0000
committersmh <smh@FreeBSD.org>2013-01-10 12:25:00 +0000
commitf63fde9f6ff56200aca4579f3579c5dbe586c7bf (patch)
treee3b2d19460da8cb1ba416654201a592f77a063d2 /sys/cam
parent648c153a8f9a3fb4a9b6e775aca67149bf7425e6 (diff)
downloadFreeBSD-src-f63fde9f6ff56200aca4579f3579c5dbe586c7bf.zip
FreeBSD-src-f63fde9f6ff56200aca4579f3579c5dbe586c7bf.tar.gz
Changed scsi_da device requests to use the sysctl tunable value for retry_count
and da_default_timeout where their current hardcoded values matched the current default value for said tunables. PR: kern/169976 Reviewed by: pjd (mentor) Approved by: mav
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/scsi/scsi_da.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 7dcbe77..cc61b8d 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -2044,7 +2044,7 @@ out:
break;
}
scsi_read_capacity(&start_ccb->csio,
- /*retries*/4,
+ /*retries*/da_retry_count,
dadone,
MSG_SIMPLE_Q_TAG,
rcap,
@@ -2067,7 +2067,7 @@ out:
break;
}
scsi_read_capacity_16(&start_ccb->csio,
- /*retries*/ 4,
+ /*retries*/ da_retry_count,
/*cbfcnp*/ dadone,
/*tag_action*/ MSG_SIMPLE_Q_TAG,
/*lba*/ 0,
@@ -2076,7 +2076,7 @@ out:
/*rcap_buf*/ (uint8_t *)rcaplong,
/*rcap_buf_len*/ sizeof(*rcaplong),
/*sense_len*/ SSD_FULL_SIZE,
- /*timeout*/ 60000);
+ /*timeout*/ da_default_timeout * 1000);
start_ccb->ccb_h.ccb_bp = NULL;
start_ccb->ccb_h.ccb_state = DA_CCB_PROBE2;
xpt_action(start_ccb);
OpenPOWER on IntegriCloud