From owner-svn-src-all@FreeBSD.ORG Tue Sep 4 17:15:20 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D9D7106566B; Tue, 4 Sep 2012 17:15:20 +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 EC19A8FC1B; Tue, 4 Sep 2012 17:15:19 +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 q84HFJxN090750; Tue, 4 Sep 2012 17:15:19 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84HFJZT090748; Tue, 4 Sep 2012 17:15:19 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201209041715.q84HFJZT090748@svn.freebsd.org> From: Jim Harris Date: Tue, 4 Sep 2012 17:15:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240092 - stable/7/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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 17:15:20 -0000 Author: jimharris Date: Tue Sep 4 17:15:19 2012 New Revision: 240092 URL: http://svn.freebsd.org/changeset/base/240092 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/7/sys/dev/isci/scil/sati.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/dev/isci/scil/sati.c ============================================================================== --- stable/7/sys/dev/isci/scil/sati.c Tue Sep 4 17:13:52 2012 (r240091) +++ stable/7/sys/dev/isci/scil/sati.c Tue Sep 4 17:15:19 2012 (r240092) @@ -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)