shithub: neoventi

Info  •  Files  •  Log  •  Branches

minor cleanup

--- a/disk.c

+++ b/disk.c

@@ -248,6 +248,19 @@

 }

 static void

+arenacheck(u32int magic, u32int version, u32int blocksize, u32int arenabase, u32int tabbase)

+{

+	if(magic != ArenaPartMagic)

+		sysfatal("bad arena partition magic number: %#ux expected ArenaPartMagic (%#ux)", magic, ArenaPartMagic);

+	if(version != 3)

+		sysfatal("bad arena partition version: only 3 is supported, found %d", version);

+	if(blocksize & (blocksize - 1))

+		sysfatal("invalid block size: %d is not a power of two", blocksize);

+	if(tabbase >= arenabase)

+		sysfatal("corrupt arena partition: partition table overlaps with storage");

+}

+

+static void

 initarenapart(char *path)

 {

 	u32int version, magic, blocksize, arenabase, tabbase, tabsize;

@@ -254,7 +267,10 @@

 	char buf[HeadSize];

 	u8int *p = (void*)buf;

 	int fd;

-	

+

+	/* This file descriptor is deliberately never closed; it is used to read

+	 * blocks from the arenas throughout the server's lifetime, and thus we

+	 * can rely on the OS to clean it up when we close. */

 	if((fd = open(path, OREAD)) < 0)

 		sysfatal("failed to open arena %s: %r", path);

 	if(pread(fd, buf, HeadSize, PartBlank) != HeadSize)

@@ -263,17 +279,10 @@

 	version = U32GET(p + 4);

 	blocksize = U32GET(p + 8);

 	arenabase = U32GET(p + 12);

-	if(magic != ArenaPartMagic)

-		sysfatal("bad arena partition magic number: %#ux expected ArenaPartMagic (%#ux)", magic, ArenaPartMagic);

-	if(version != 3)

-		sysfatal("bad arena partition version: only 3 is supported, found %d", version);

-	if(blocksize & (blocksize - 1))

-		sysfatal("invalid block size: %d is not a power of two", blocksize);

 	/* Head is not perfectly aligned; table must be aligned as first block */

 	tabbase = (PartBlank + HeadSize + blocksize - 1) & ~(blocksize - 1);

-	if(tabbase >= arenabase)

-		sysfatal("arena partition table overlaps with storage");

 	tabsize = arenabase - tabbase;

+	arenacheck(magic, version, blocksize, arenabase, tabbase);

 	readarenatable(fd, tabbase, tabsize, blocksize);

 }