From owner-svn-src-stable@FreeBSD.ORG  Fri Apr  5 11:50:05 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CE502301;
 Fri,  5 Apr 2013 11:50:05 +0000 (UTC) (envelope-from mav@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 C109512F;
 Fri,  5 Apr 2013 11:50:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35Bo59E063824;
 Fri, 5 Apr 2013 11:50:05 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35Bo5sT063823;
 Fri, 5 Apr 2013 11:50:05 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304051150.r35Bo5sT063823@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 5 Apr 2013 11:50:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r249156 - stable/9/sys/cam/scsi
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Apr 2013 11:50:05 -0000

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