From owner-svn-src-all@FreeBSD.ORG  Mon Jun 25 07:06:58 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EB5AE1065675;
	Mon, 25 Jun 2012 07:06:58 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D71D08FC0A;
	Mon, 25 Jun 2012 07:06:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5P76wVX056608;
	Mon, 25 Jun 2012 07:06:58 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5P76w57056606;
	Mon, 25 Jun 2012 07:06:58 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201206250706.q5P76w57056606@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 25 Jun 2012 07:06:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237548 - stable/9/sys/cam
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jun 2012 07:06:59 -0000

Author: mav
Date: Mon Jun 25 07:06:58 2012
New Revision: 237548
URL: http://svn.freebsd.org/changeset/base/237548

Log:
  MFC r237446:
  Don't print SCSI Queue Full and CAM_REQUEUE_REQ statuses as errors if they
  were handled and retried. They are part of normal operation for SCSI TCQ.

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

Modified: stable/9/sys/cam/cam_periph.c
==============================================================================
--- stable/9/sys/cam/cam_periph.c	Mon Jun 25 05:47:12 2012	(r237547)
+++ stable/9/sys/cam/cam_periph.c	Mon Jun 25 07:06:58 2012	(r237548)
@@ -1325,6 +1325,7 @@ camperiphscsistatuserror(union ccb *ccb,
 			}
 			*timeout = 0;
 			error = ERESTART;
+			*print = 0;
 			break;
 		}
 		/* FALLTHROUGH */
@@ -1654,8 +1655,10 @@ cam_periph_error(union ccb *ccb, cam_fla
 		} else if (sense_flags & SF_NO_RETRY) {
 			error = EIO;
 			action_string = "Retry was blocked";
-		} else
+		} else {
 			error = ERESTART;
+			print = 0;
+		}
 		break;
 	case CAM_RESRC_UNAVAIL:
 		/* Wait a bit for the resource shortage to abate. */