From owner-svn-src-all@FreeBSD.ORG  Thu Sep  6 16:38:56 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 3420B106566C;
	Thu,  6 Sep 2012 16:38:56 +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 1F51E8FC08;
	Thu,  6 Sep 2012 16:38:56 +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 q86GctuQ051663;
	Thu, 6 Sep 2012 16:38:55 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q86GctDj051661;
	Thu, 6 Sep 2012 16:38:55 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201209061638.q86GctDj051661@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Thu, 6 Sep 2012 16:38:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240168 - releng/9.1/sys/dev/isci/scil
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: Thu, 06 Sep 2012 16:38:56 -0000

Author: jimharris
Date: Thu Sep  6 16:38:55 2012
New Revision: 240168
URL: http://svn.freebsd.org/changeset/base/240168

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
  Approved by:	re (kib)

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

Modified: releng/9.1/sys/dev/isci/scil/sati.c
==============================================================================
--- releng/9.1/sys/dev/isci/scil/sati.c	Thu Sep  6 16:27:59 2012	(r240167)
+++ releng/9.1/sys/dev/isci/scil/sati.c	Thu Sep  6 16:38:55 2012	(r240168)
@@ -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)