From owner-svn-src-head@FreeBSD.ORG  Thu Jan 10 12:25:01 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 18425F17;
 Thu, 10 Jan 2013 12:25:01 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0A805A30;
 Thu, 10 Jan 2013 12:25:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0ACP08b085330;
 Thu, 10 Jan 2013 12:25:00 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0ACP0sX085329;
 Thu, 10 Jan 2013 12:25:00 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201301101225.r0ACP0sX085329@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Thu, 10 Jan 2013 12:25:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245253 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jan 2013 12:25:01 -0000

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);