From owner-svn-src-head@FreeBSD.ORG  Tue Apr  9 12:20:45 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 18855C90;
 Tue,  9 Apr 2013 12:20:45 +0000 (UTC)
 (envelope-from glebius@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 0BCA86E5;
 Tue,  9 Apr 2013 12:20:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r39CKirT093180;
 Tue, 9 Apr 2013 12:20:44 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r39CKimD093179;
 Tue, 9 Apr 2013 12:20:44 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201304091220.r39CKimD093179@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 9 Apr 2013 12:20:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249305 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 09 Apr 2013 12:20:45 -0000

Author: glebius
Date: Tue Apr  9 12:20:44 2013
New Revision: 249305
URL: http://svnweb.freebsd.org/changeset/base/249305

Log:
  Fix KASSERTs: maximum number of items per slab is 256.

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Tue Apr  9 12:01:54 2013	(r249304)
+++ head/sys/vm/uma_core.c	Tue Apr  9 12:20:44 2013	(r249305)
@@ -1171,7 +1171,7 @@ keg_small_init(uma_keg_t keg)
 	}
 
 	keg->uk_ipers = (keg->uk_slabsize - shsize) / rsize;
-	KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= 255,
+	KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= 256,
 	    ("%s: keg->uk_ipers %u", __func__, keg->uk_ipers));
 
 	memused = keg->uk_ipers * rsize + shsize;
@@ -1191,7 +1191,7 @@ keg_small_init(uma_keg_t keg)
 	if ((wastedspace >= keg->uk_slabsize / UMA_MAX_WASTE) &&
 	    (keg->uk_ipers < (keg->uk_slabsize / keg->uk_rsize))) {
 		keg->uk_ipers = keg->uk_slabsize / keg->uk_rsize;
-		KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= 255,
+		KASSERT(keg->uk_ipers > 0 && keg->uk_ipers <= 256,
 		    ("%s: keg->uk_ipers %u", __func__, keg->uk_ipers));
 #ifdef UMA_DEBUG
 		printf("UMA decided we need offpage slab headers for "
@@ -1726,7 +1726,7 @@ uma_startup(void *bootmem, int boot_page
 		objsize--;
 	uma_max_ipers_ref = MAX(UMA_SLAB_SIZE / objsize, 64);
 
-	KASSERT((uma_max_ipers_ref <= 255) && (uma_max_ipers <= 255),
+	KASSERT((uma_max_ipers_ref <= 256) && (uma_max_ipers <= 256),
 	    ("uma_startup: calculated uma_max_ipers values too large!"));
 
 #ifdef UMA_DEBUG