From owner-svn-src-stable@FreeBSD.ORG  Tue Sep  4 15:58:59 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 29FE11065670;
	Tue,  4 Sep 2012 15:58:59 +0000 (UTC)
	(envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 143C78FC14;
	Tue,  4 Sep 2012 15:58:59 +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 q84FwwYU080034;
	Tue, 4 Sep 2012 15:58:58 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84Fwwbw080032;
	Tue, 4 Sep 2012 15:58:58 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201209041558.q84Fwwbw080032@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Tue, 4 Sep 2012 15:58: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: r240089 - stable/9/sys/dev/isci/scil
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 04 Sep 2012 15:58:59 -0000

Author: jimharris
Date: Tue Sep  4 15:58:58 2012
New Revision: 240089
URL: http://svn.freebsd.org/changeset/base/240089

Log:
  MFC r239889:
  
  Do not call sati_check_data_io() for SATI_UNMAP sequences.
  
  This routine is intended only for commands such as INQUIRY where
  the controller may fill out a smaller amount of data than allocated
  by the host.
  
  The end result of this bug was that isci(4) would report non-zero
  resid for successful SCSI_UNMAP commands.
  
  Sponsored by:   Intel

Modified:
  stable/9/sys/dev/isci/scil/sati.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/isci/scil/sati.c
==============================================================================
--- stable/9/sys/dev/isci/scil/sati.c	Tue Sep  4 12:27:23 2012	(r240088)
+++ stable/9/sys/dev/isci/scil/sati.c	Tue Sep  4 15:58:58 2012	(r240089)
@@ -1095,10 +1095,6 @@ SATI_STATUS sati_translate_command_respo
          status = sati_unmap_translate_response(
                      sequence, scsi_io, ata_io
                   );
-         if(status == SATI_COMPLETE)
-         {
-            status = sati_check_data_io(sequence);
-         }
       break;
 #endif // !defined(DISABLE_SATI_UNMAP)