svn commit: r249156 - stable/9/sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Fri Apr  5 11:50:05 2013
New Revision: 249156
URL: http://svnweb.freebsd.org/changeset/base/249156

Log:
  MFC r245253 (by smh):
  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

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

Modified: stable/9/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_da.c	Fri Apr  5 11:48:35 2013	(r249155)
+++ stable/9/sys/cam/scsi/scsi_da.c	Fri Apr  5 11:50:05 2013	(r249156)
@@ -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,
@@ -2075,7 +2075,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);