From owner-svn-src-all@FreeBSD.ORG  Thu Mar 21 22:36:44 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 86D01703;
 Thu, 21 Mar 2013 22:36:44 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 79043F37;
 Thu, 21 Mar 2013 22:36:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2LMaihr055569;
 Thu, 21 Mar 2013 22:36:44 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2LMaiQD055568;
 Thu, 21 Mar 2013 22:36:44 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201303212236.r2LMaiQD055568@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 21 Mar 2013 22:36:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248596 - head/sys/geom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 21 Mar 2013 22:36:44 -0000

Author: kib
Date: Thu Mar 21 22:36:43 2013
New Revision: 248596
URL: http://svnweb.freebsd.org/changeset/base/248596

Log:
  Correct the page count when excess length is trimmed from the bio.
  
  Reported and tested by:	Ivan Klymenko <fidaj@ukr.net

Modified:
  head/sys/geom/geom_io.c

Modified: head/sys/geom/geom_io.c
==============================================================================
--- head/sys/geom/geom_io.c	Thu Mar 21 22:24:54 2013	(r248595)
+++ head/sys/geom/geom_io.c	Thu Mar 21 22:36:43 2013	(r248596)
@@ -718,8 +718,17 @@ g_io_schedule_down(struct thread *tp __u
 			 */
 			excess = bp->bio_offset + bp->bio_length;
 			if (excess > bp->bio_to->mediasize) {
+				KASSERT((bp->bio_flags & BIO_UNMAPPED) == 0 ||
+				    round_page(bp->bio_ma_offset +
+				    bp->bio_length) / PAGE_SIZE == bp->bio_ma_n,
+				    ("excess bio %p too short", bp));
 				excess -= bp->bio_to->mediasize;
 				bp->bio_length -= excess;
+				if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
+					bp->bio_ma_n = round_page(
+					    bp->bio_ma_offset +
+					    bp->bio_length) / PAGE_SIZE;
+				}
 				if (excess > 0)
 					CTR3(KTR_GEOM, "g_down truncated bio "
 					    "%p provider %s by %d", bp,