Author: smh
Date: Thu Jan 10 12:25:00 2013
New Revision: 245253
URL: http://svnweb.freebsd.org/changeset/base/245253

Log:
  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

Modified:
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c Thu Jan 10 11:57:46 2013        (r245252)
+++ head/sys/cam/scsi/scsi_da.c Thu Jan 10 12:25:00 2013        (r245253)
@@ -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);  
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to