svn commit: r251460 - stable/8/sys/cam/scsi

[Steven Hartland]

Author: smh
Date: Thu Jun  6 09:58:23 2013
New Revision: 251460
URL: http://svnweb.freebsd.org/changeset/base/251460

Log:
  MFC r245253:
  Use sysctl tuneable values for scsi_da and retry_count

Modified:
  stable/8/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/cam/   (props changed)

Modified: stable/8/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_da.c	Thu Jun  6 09:55:00 2013	(r251459)
+++ stable/8/sys/cam/scsi/scsi_da.c	Thu Jun  6 09:58:23 2013	(r251460)
@@ -1910,7 +1910,7 @@ out:
 			break;
 		}
 		scsi_read_capacity(&start_ccb->csio,
-				   /*retries*/4,
+				   /*retries*/da_retry_count,
 				   dadone,
 				   MSG_SIMPLE_Q_TAG,
 				   rcap,
@@ -1933,7 +1933,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,
@@ -1941,7 +1941,7 @@ out:
 				      /*pmi*/ 0,
 				      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);