commit 67a65bbaa5df3751206eca4fd0c2db359095800f
from: Russ Cox <rsc@swtch.com>
date: Tue Sep 25 02:33:34 2007 UTC

venti: formatting changes in fixarenas

commit - c1edcb95cf02a22ae08dad2127262ca009005fad
commit + 67a65bbaa5df3751206eca4fd0c2db359095800f
blob - 009c8e2739b956f6e36ab1e1b1eda6669c4a68cc
blob + fd9dccc5eef0c12208c3f621808999a5919e07db
--- src/cmd/venti/srv/fixarenas.c
+++ src/cmd/venti/srv/fixarenas.c
@@ -14,6 +14,8 @@
 #include "dat.h"
 #include "fns.h"
 #include "whack.h"
+
+#define ROUNDUP(x,n)		(((x)+(n)-1)&~((n)-1))
 
 #pragma varargck type "z" uvlong
 #pragma varargck type "z" vlong
@@ -793,8 +795,8 @@ guessgeometry(void)
 		}
 		ap.arenabase = bestdiff;
 	}
-	
-	ap.tabbase = (PartBlank+HeadSize+ap.blocksize-1)&~(ap.blocksize-1);
+
+	ap.tabbase = ROUNDUP(PartBlank+HeadSize, ap.blocksize);
 	/*
 	 * XXX pick up table, check arenabase.
 	 * XXX pick up table, record base name.
@@ -806,7 +808,7 @@ guessgeometry(void)
 	 */
 	if(ap.arenabase == 0){
 		for(i=0; i<nelem(tabsizes); i++){
-			ap.arenabase = (PartBlank+HeadSize+tabsizes[i]+ap.blocksize-1)&~(ap.blocksize-1);
+			ap.arenabase = ROUNDUP(PartBlank+HeadSize, ap.blocksize);
 			p = pagein(ap.arenabase, Block);
 			if(u32(p) == ArenaHeadMagic)
 				break;