From owner-svn-src-head@FreeBSD.ORG  Tue Mar  4 15:07:01 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7D348ED2;
 Tue,  4 Mar 2014 15:07:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A816FE0;
 Tue,  4 Mar 2014 15:07:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s24F71Y5059218;
 Tue, 4 Mar 2014 15:07:01 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s24F71E6059216;
 Tue, 4 Mar 2014 15:07:01 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201403041507.s24F71E6059216@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 4 Mar 2014 15:07:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262741 - head/sys/cam
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.17
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: Tue, 04 Mar 2014 15:07:01 -0000

Author: mav
Date: Tue Mar  4 15:07:00 2014
New Revision: 262741
URL: http://svnweb.freebsd.org/changeset/base/262741

Log:
  Do not retry on CAM_FUNC_NOTAVAIL error, but return immediately.
  
  MFC after:	2 weeks

Modified:
  head/sys/cam/cam_periph.c

Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c	Tue Mar  4 14:49:05 2014	(r262740)
+++ head/sys/cam/cam_periph.c	Tue Mar  4 15:07:00 2014	(r262741)
@@ -1655,6 +1655,7 @@ cam_periph_error(union ccb *ccb, cam_fla
 	case CAM_REQ_TOO_BIG:
 	case CAM_LUN_INVALID:
 	case CAM_TID_INVALID:
+	case CAM_FUNC_NOTAVAIL:
 		error = EINVAL;
 		break;
 	case CAM_SCSI_BUS_RESET: