Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 23 Nov 2012 07:06:24 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r243430 - projects/counters/sys/vm
Message-ID:  <201211230706.qAN76Ok9059862@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Fri Nov 23 07:06:24 2012
New Revision: 243430
URL: http://svnweb.freebsd.org/changeset/base/243430

Log:
  Right now PAGE_SIZE == UMA_SLAB_SIZE, but that can change in future.
  
  Use PAGE_SIZE when we are multiplying pages or uk_ppera. The change is
  a nop, but makes code consistent.

Modified:
  projects/counters/sys/vm/uma_core.c

Modified: projects/counters/sys/vm/uma_core.c
==============================================================================
--- projects/counters/sys/vm/uma_core.c	Fri Nov 23 07:02:01 2012	(r243429)
+++ projects/counters/sys/vm/uma_core.c	Fri Nov 23 07:06:24 2012	(r243430)
@@ -746,9 +746,9 @@ finished:
 			    SKIP_NONE, ZFREE_STATFREE);
 #ifdef UMA_DEBUG
 		printf("%s: Returning %d bytes.\n",
-		    keg->uk_name, UMA_SLAB_SIZE * keg->uk_ppera);
+		    keg->uk_name, PAGE_SIZE * keg->uk_ppera);
 #endif
-		keg->uk_freef(mem, UMA_SLAB_SIZE * keg->uk_ppera, flags);
+		keg->uk_freef(mem, PAGE_SIZE * keg->uk_ppera, flags);
 	}
 }
 
@@ -846,7 +846,7 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t
 		wait |= M_NODUMP;
 
 	/* zone is passed for legacy reasons. */
-	mem = allocf(zone, keg->uk_ppera * UMA_SLAB_SIZE, &flags, wait);
+	mem = allocf(zone, keg->uk_ppera * PAGE_SIZE, &flags, wait);
 	if (mem == NULL) {
 		if (keg->uk_flags & UMA_ZONE_OFFPAGE)
 			zone_free_item(keg->uk_slabzone, slab, NULL,
@@ -908,7 +908,7 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t
 			if (keg->uk_flags & UMA_ZONE_OFFPAGE)
 				zone_free_item(keg->uk_slabzone, slab,
 				    NULL, SKIP_NONE, ZFREE_STATFREE);
-			keg->uk_freef(mem, UMA_SLAB_SIZE * keg->uk_ppera,
+			keg->uk_freef(mem, PAGE_SIZE * keg->uk_ppera,
 			    flags);
 			KEG_LOCK(keg);
 			return (NULL);
@@ -1193,10 +1193,10 @@ keg_large_init(uma_keg_t keg)
 	KASSERT((keg->uk_flags & UMA_ZFLAG_CACHEONLY) == 0,
 	    ("keg_large_init: Cannot large-init a UMA_ZFLAG_CACHEONLY keg"));
 
-	pages = keg->uk_size / UMA_SLAB_SIZE;
+	pages = keg->uk_size / PAGE_SIZE;
 
 	/* Account for remainder */
-	if ((pages * UMA_SLAB_SIZE) < keg->uk_size)
+	if ((pages * PAGE_SIZE) < keg->uk_size)
 		pages++;
 
 	keg->uk_ppera = pages;

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