From owner-svn-src-projects@FreeBSD.ORG  Tue Aug 23 13:25:29 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA4E61065674;
	Tue, 23 Aug 2011 13:25:29 +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 9AAB98FC1F;
	Tue, 23 Aug 2011 13:25:29 +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 p7NDPTlM004402;
	Tue, 23 Aug 2011 13:25:29 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7NDPTCf004400;
	Tue, 23 Aug 2011 13:25:29 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201108231325.p7NDPTCf004400@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 23 Aug 2011 13:25:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225110 - projects/zfsd/head/sys/cam/scsi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Aug 2011 13:25:29 -0000

Author: mav
Date: Tue Aug 23 13:25:29 2011
New Revision: 225110
URL: http://svn.freebsd.org/changeset/base/225110

Log:
  Tuning r225108, trust ETA flag zero status also when there is some
  thermometer available.

Modified:
  projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c

Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c
==============================================================================
--- projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c	Tue Aug 23 13:17:09 2011	(r225109)
+++ projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c	Tue Aug 23 13:25:29 2011	(r225110)
@@ -516,7 +516,7 @@ safte_rdstat(enc_softc_t *ssc, int slpfl
 			 * Just say 'OK', and use the reserved value of
 			 * zero.
 			 */
-			if (cc->Ntstats == 0)
+			if ((cc->Ntherm + cc->Ntstats) == 0)
 				cache->elm_map[oid].encstat[0] =
 				    SES_OBJSTAT_NOTAVAIL;
 			else