Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 May 2015 08:07:11 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r282522 - head/sys/vm
Message-ID:  <201505060807.t4687B52038458@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Wed May  6 08:07:11 2015
New Revision: 282522
URL: https://svnweb.freebsd.org/changeset/base/282522

Log:
  Fix the KASSERT and improve wording in r282426.
  
  Submitted by:	alc

Modified:
  head/sys/vm/vnode_pager.c

Modified: head/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c	Wed May  6 07:53:43 2015	(r282521)
+++ head/sys/vm/vnode_pager.c	Wed May  6 08:07:11 2015	(r282522)
@@ -342,12 +342,12 @@ vnode_pager_haspage(vm_object_t object, 
 		if (after) {
 			/*
 			 * The BMAP vop can report a partial block in the
-			 * 'after', but must not count blocks after EOF.
+			 * 'after', but must not report blocks after EOF.
 			 * Assert the latter, and truncate 'after' in case
 			 * of the former.
 			 */
-			KASSERT(reqblock + *after <=
-			    object->size * pagesperblock,
+			KASSERT((reqblock + *after) * pagesperblock <
+			    roundup2(object->size, pagesperblock),
 			    ("%s: reqblock %jd after %d size %ju", __func__,
 			    (intmax_t )reqblock, *after,
 			    (uintmax_t )object->size));



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505060807.t4687B52038458>