svn commit: r282522 - head/sys/vm

Gleb Smirnoff glebius at FreeBSD.org
Wed May 6 08:07:11 UTC 2015


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));


More information about the svn-src-all mailing list