From owner-svn-src-head@FreeBSD.ORG  Wed Jul 18 18:10:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 91E8B1065672;
	Wed, 18 Jul 2012 18:10:28 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7CB138FC14;
	Wed, 18 Jul 2012 18:10:28 +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 q6IIAStD096860;
	Wed, 18 Jul 2012 18:10:28 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6IIASs1096858;
	Wed, 18 Jul 2012 18:10:28 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201207181810.q6IIASs1096858@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 18 Jul 2012 18:10:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238601 - head/sys/dev/aac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 18 Jul 2012 18:10:28 -0000

Author: sbruno
Date: Wed Jul 18 18:10:27 2012
New Revision: 238601
URL: http://svn.freebsd.org/changeset/base/238601

Log:
  On BIO_ERROR, set bio_resid to stop losing data in the error case.
  
  Submitted by:	Mark Johnston <markjdb@gmail.com>
  Reviewed by:	scottl@freebsd.org
  MFC after:	2 weeks

Modified:
  head/sys/dev/aac/aac_disk.c

Modified: head/sys/dev/aac/aac_disk.c
==============================================================================
--- head/sys/dev/aac/aac_disk.c	Wed Jul 18 16:13:03 2012	(r238600)
+++ head/sys/dev/aac/aac_disk.c	Wed Jul 18 18:10:27 2012	(r238601)
@@ -334,8 +334,10 @@ aac_biodone(struct bio *bp)
 {
 	fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	if (bp->bio_flags & BIO_ERROR)
+	if (bp->bio_flags & BIO_ERROR) {
+		bp->bio_resid = bp->bio_bcount;
 		disk_err(bp, "hard error", -1, 1);
+	}
 
 	biodone(bp);
 }