code: mafs

Download patch

ref: c90cf36d55e6ec3b9bc1e2c6fe1ef52a4e020654
parent: 7c1b7019f8e0281bf511174839520716bebbc8fb
author: 9ferno <gophone2015@gmail.com>
date: Fri Oct 21 02:07:20 EDT 2022

fixed more issues that cropped with the change away from Spans

--- a/9p.c
+++ b/9p.c
@@ -1194,10 +1194,10 @@
 
 	if(d == nil || wbuf == nil || wbufsize == 0)
 		return 0;
-	buf = getdatablkat(d, offset/Rawblocksize, Bwritable);
+	buf = getdatablkat(d, offset/Blocksize, Bwritable);
 	if(buf == nil)
 		return -1;
-	n = min(Rawblocksize, wbufsize);
+	n = min(Blocksize, wbufsize);
 	memcpy(buf->io->buf, wbuf, n);
 	putbuf(buf);
 	return n;
@@ -1222,10 +1222,10 @@
 		overlay data
 	 */
 
-	blkno = rel2abs(d, offset/Rawblocksize);
+	blkno = rel2abs(d, offset/Blocksize);
 	if(chatty9p > 1)
-	dprint("update rel2abs d->name %s d->size %llud reli offset %llud\n"
-				"	offset/Blocksize %llud blkno %llud\n",
+	dprint("update d->name %s d->size %llud offset %llud"
+				" rel2abs(offset/Blocksize %llud) = blkno %llud\n",
 				d->name, d->size, offset, offset/Blocksize, blkno);
 	buf = getbufchk(blkno, Bwritable, Tdata, d->qid.path);
 	if(buf == nil)
@@ -1234,7 +1234,16 @@
 	/* overlay the new contents */
 	to = offset%Blocksize;
 	howmuch = min(Blocksize-to, wbufsize);
+	if(chatty9p > 1){
+		dprint("updating buf->blkno %llud offset %llud size %llud\n",
+				buf->blkno, to, howmuch);
+		showbuf(buf);
+	}
 	memcpy(buf->io->buf+to, wbuf, howmuch);
+	if(chatty9p > 1){
+		dprint("update after\n");
+		showbuf(buf);
+	}
 	putbuf(buf);
 	return howmuch;
 }
@@ -1350,7 +1359,7 @@
 
 		if(chatty9p > 1)
 			dprint("writefile(): d->name %s d->size %llud offset %llud"
-					" written %d offset+written %llud wbufsize %llud\n",
+					" written %d offset+written %llud wbufsize %ld\n",
 				d->name, d->size, offset, written, offset+written, wbufsize);
 		/* all the below functions only write upto the end of an extent.
 		   Hence, the need for a loop to keep repeating.
--- a/all.h
+++ b/all.h
@@ -55,7 +55,6 @@
 	Ref;
 	RWLock;
 	u64	blkno;		/* block number on the disk, primary key */
-	u16 len;		/* number of blocks of data xiobuf points to */
 	Iobuf	*fore;	/* for lru */
 	Iobuf	*back;	/* for lru */
 	union{
--- a/blk.c
+++ b/blk.c
@@ -73,7 +73,7 @@
 
 	t = (Tag*)buf;
 	if(t->type < Maxtind)
-		fprint(fd, "%s %d %llud\n", tagnames[t->type], t->len, t->path);
+		fprint(fd, "%s %llud\n", tagnames[t->type], t->path);
 	if(t->type == Tdentry){
 		showdentry(fd, buf+sizeof(Tag));
 	}else if(t->path == Qpmagic){
@@ -86,7 +86,7 @@
 		showdata(fd, buf+sizeof(Tag));
 	}else if(t->type >= Tind0 && t->type < Maxtind){
 		showind(fd, buf+sizeof(Tag));
-	}else if(t->type != 0 || t->path != 0 || t->dirty != 0 || t->len != 0){
+	}else if(t->type != 0 || t->path != 0 || t->dirty != 0){
 		fprint(fd, "unknown tag type %d path %llud\n", t->type, t->path);
 	}
 }
--- a/block.c
+++ b/block.c
@@ -42,7 +42,7 @@
 		panic("null size %s", devfile);
 
 	if(debug){
-		print("Dentry1 size %d Namelen %d\n", sizeof(Dentry1), Namelen);
+		print("Dentry1 size %d Namelen %llud\n", sizeof(Dentry1), Namelen);
 		print("Dentry size %d\n", sizeof(Dentry));
 	}
 
--- a/dat.h
+++ b/dat.h
@@ -134,7 +134,6 @@
 	u8 dirty;	/* is 1, when being written to.
 					Identifies dirty data on a crash.
 					This byte position is denoted by the enum Nthdirty. */
-	u16 len;	/* number of blocks in this Spanid */
 };
 
 /* DONT TOUCH, this is the disk structure */
--- a/extents.c
+++ b/extents.c
@@ -350,13 +350,13 @@
 	Extent *e;
 
 /*	if(chatty9p > 7){
-		showextents("		before\n", es);
-		print(" +%llud %llud\n", blkno, len);
+		showextents(2, "		before\n", es);
+		fprint(2, " +%llud %llud\n", blkno, len);
 	}*/
 	e = doadd(es, blkno, len);
 	es->lru = e;
 /*	if(chatty9p > 7)
-		showextents("		after\n", es);*/
+		showextents(2, "		after\n", es);*/
 	return e;
 }
 
@@ -428,9 +428,9 @@
 	return oldblkno;
 }
 
-/* allocate a block and return that block number */
+/* allocate n blocks and return that block number */
 u64
-balloc(Extents *es)
+balloc(Extents *es, u64 n)
 {
 	Extent *e;
 	u64 blkno;
@@ -442,19 +442,19 @@
 	qlock(&es->el);
 /*	if(chatty9p > 7){
 		snprint(msg, 64, "balloc() %llud blocks:\n", n);
-		showextents(msg, es);
+		showextents(2, msg, es);
 	}*/
-	for(e = smallest(es); e != nil; e = e->big)
+	for(e = smallest(es); e != nil && e->len < n; e = e->big)
 		;
 	if(e == nil){
 		// snprint(msg, 64, "balloc() %llud blocks:\n", n);
-		// showextents(msg, es);
+		// showextents(fd, msg, es);
 		panic("balloc: out of free blocks");
 	}
-	else if(e->len == 1)
+	else if(e->len == n)
 		blkno = pluck(es, e);
 	else /* found something bigger */
-		blkno = slice(es, e, 1);
+		blkno = slice(es, e, n);
 
 	qunlock(&es->el);
 	return blkno;
@@ -693,19 +693,19 @@
 	fprint(fd, "%s", msg);
 	for(e = lowest(es); e != nil; e = e->high){
 		fprint(fd, "	%llud .. %llud", e->blkno, e->blkno+e->len-1);
-//		showextent("	", e);
+//		showextent(fd, "	", e);
 		fprint(fd, "\n");
 	}
 	fprint(fd, "			ordered by size\n");
 	for(e = smallest(es); e != nil; e = e->big){
 		fprint(fd, "	%llud .. %llud has %llud blocks", e->blkno, e->blkno+e->len-1, e->len);
-//		showextent("	", e);
+//		showextent(fd, "	", e);
 		fprint(fd, "\n");
 	}
 }
 
 void
-showblocknos(Extents *es)
+showblocknos(int fd, Extents *es)
 {
 	Extent *e;
 	u64 i;
@@ -712,7 +712,7 @@
 
 	for(e = lowest(es); e != nil; e = e->high)
 		for(i = e->blkno; i<e->blkno+e->len; i++)
-			print("%llud\n", i);
+			fprint(fd, "%llud\n", i);
 }
 
 void *
--- a/extents.h
+++ b/extents.h
@@ -30,13 +30,13 @@
 s8	find(Extents *es, u64 bno);
 Extent *add(Extents *es, u64 blkno, u64 len);
 
-void	showblocknos(Extents *es);
+void	showblocknos(int fd, Extents *es);
 void	showextents(int fd, char *msg, Extents *es);
 s32	sizeofextents(Extents *es);
 s32	saveextents(Extents *es, s8 *buf, u32 nbuf);
 s32	loadextents(Extents *es, s8 *buf, u32 nbuf);
 
-u64	 balloc(Extents *es);
+u64	 balloc(Extents *es, u64 len);
 void bfree(Extents *es, u64 blkno, u64 len);
 u64	 nfrees(Extents *es);
 
--- a/free.c
+++ b/free.c
@@ -52,7 +52,7 @@
 	checkblock(Bdfrees, Tdentry, Qpfrees);
 	getfrees(Bdfrees);
 // showextents("after getfrees", &frees);
-	showblocknos(&frees);
+	showblocknos(1, &frees);
 	exits(0);
 }
 
--- a/iobuf.c
+++ b/iobuf.c
@@ -336,7 +336,6 @@
 	if(p->io == nil)
 		panic("settag %s(%llux) tag/path=%s/%llud: p->io == nil\n",
 				devfile, (u64)p->blkno, tagnames[tagtype], qpath);
-	p->io->len = p->len;
 	p->io->type = tagtype;
 	p->io->path = qpath;
 }
--- a/sub.c
+++ b/sub.c
@@ -100,7 +100,7 @@
 	u64 blkno;
 	Iobuf *buf;
 
-	blkno = balloc(&frees);
+	blkno = balloc(&frees, 1);
 	if(blkno == 0)
 		return nil;	/* the caller should trigger an Efull message */
 
@@ -450,7 +450,7 @@
 	superream(size, nblocks);
 
 	iob = getbuf(Bmagicb, Bwritable, Bfreshalloc);
-	snprint((s8*)iob->io->buf+256, Rawblocksize-256, "%s%d\n\n",
+	snprint((s8*)iob->io->buf+256, Rawblocksize-256, "%s%llud\n",
 			magic, Rawblocksize);
 	settag(iob, Tmagic, Qpmagic);
 	putbuf(iob);
@@ -517,7 +517,7 @@
 	}
 	rbufsize = strtoul((s8*)b->io->buf+256+strlen(magic), &rptr, 10);
 	if(rbufsize != Rawblocksize){
-		print("init incorrect block size Rawblocksize %d rbufsize %d\n",
+		print("init incorrect block size Rawblocksize %llud rbufsize %d\n",
 				Rawblocksize, rbufsize);
 		panic("bad Rawblocksize != rbufsize");
 	}
--- a/tests/regress.rc
+++ b/tests/regress.rc
@@ -86,13 +86,17 @@
 }
 
 if(~ $#* 0){
+	chkreli.rc
+	chkextents.rc
 	for (t in test.*){
 		rununi $t
 		runmp $t
 	}
-	chkextents.rc
 }
 if not {
+	if(~ $"* reli){
+		chkreli.rc
+	}
 	if(~ $"* extents){
 		chkextents.rc
 	}
--- a/tests/test.0/blocks/0
+++ b/tests/test.0/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.0/blocks/1
+++ b/tests/test.0/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.0/blocks/10
+++ b/tests/test.0/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653077828957621003
+mtime 1666329175295312888
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 31 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 31
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.0/blocks/11
+++ b/tests/test.0/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653077828957823822
+mtime 1666329175295317307
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 30 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 30
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.0/blocks/12
+++ b/tests/test.0/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653077828958055974
+mtime 1666329175295319284
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 29 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 29
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.0/blocks/13
+++ b/tests/test.0/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653077828958258793
+mtime 1666329175295323928
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 24 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 24
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.0/blocks/14
+++ b/tests/test.0/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653077828958458260
+mtime 1666329175295325863
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 23 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 23
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.0/blocks/15
+++ b/tests/test.0/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219330282696132
+mtime 1666329175295327710
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 22 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 22
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.0/blocks/16
+++ b/tests/test.0/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653077828956823136
+mtime 1666329175295303223
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.0/blocks/17
+++ b/tests/test.0/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 19
 pdblkno 4
 pqpath 5
-mtime 1653219331339126751
+mtime 1666329177416394129
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 18 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 18
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.0/blocks/18
+++ b/tests/test.0/blocks/18
@@ -1,3 +1,3 @@
-Tdata 1 15
+Tdata 15
 18 .. 21
 25 .. 28
--- a/tests/test.0/blocks/19
+++ b/tests/test.0/blocks/19
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.0/blocks/2
+++ b/tests/test.0/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 64
--- a/tests/test.0/blocks/20
+++ b/tests/test.0/blocks/20
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.0/blocks/21
+++ b/tests/test.0/blocks/21
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.0/blocks/22
+++ b/tests/test.0/blocks/22
@@ -1,1 +1,1 @@
-Tdata 1 13
+Tdata 13
--- a/tests/test.0/blocks/23
+++ b/tests/test.0/blocks/23
@@ -1,4 +1,4 @@
-Tdata 1 12
+Tdata 12
 start 0
 tfree 0
 qidgen 64
--- a/tests/test.0/blocks/24
+++ b/tests/test.0/blocks/24
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.0/blocks/25
+++ b/tests/test.0/blocks/25
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.0/blocks/26
+++ b/tests/test.0/blocks/26
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.0/blocks/27
+++ b/tests/test.0/blocks/27
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.0/blocks/28
+++ b/tests/test.0/blocks/28
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.0/blocks/29
+++ b/tests/test.0/blocks/29
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.0/blocks/3
+++ b/tests/test.0/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653078704020709001
+mtime 1666329175295333183
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.0/blocks/30
+++ b/tests/test.0/blocks/30
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 64
--- a/tests/test.0/blocks/31
+++ b/tests/test.0/blocks/31
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.0/blocks/4
+++ b/tests/test.0/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653078593182939124
+mtime 1666329175295288886
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.0/blocks/5
+++ b/tests/test.0/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653078593183338057
+mtime 1666329175295298713
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.0/blocks/6
+++ b/tests/test.0/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653078593183740343
+mtime 1666329175295304952
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.0/blocks/7
+++ b/tests/test.0/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653078593184139276
+mtime 1666329175295306785
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.0/blocks/8
+++ b/tests/test.0/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.0/blocks/9
+++ b/tests/test.0/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653078383484959375
+mtime 1666329175295296450
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.1/blocks/0
+++ b/tests/test.1/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.1/blocks/1
+++ b/tests/test.1/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.1/blocks/10
+++ b/tests/test.1/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351539603
+mtime 1666331993065536646
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 31 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 31
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.1/blocks/11
+++ b/tests/test.1/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351740745
+mtime 1666331993065540434
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 30 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 30
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.1/blocks/12
+++ b/tests/test.1/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351939374
+mtime 1666331993065542088
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 29 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 29
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.1/blocks/13
+++ b/tests/test.1/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352137164
+mtime 1666331993065546043
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 24 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 24
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.1/blocks/14
+++ b/tests/test.1/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352337469
+mtime 1666331993065547831
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 23 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 23
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.1/blocks/15
+++ b/tests/test.1/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352541126
+mtime 1666331993065549444
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 22 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 22
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.1/blocks/16
+++ b/tests/test.1/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653219675350736707
+mtime 1666331993065527426
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.1/blocks/17
+++ b/tests/test.1/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 19
 pdblkno 4
 pqpath 5
-mtime 1665241420136494979
+mtime 1666331995204020564
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 21 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 21
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.1/blocks/18
+++ b/tests/test.1/blocks/18
@@ -1,42 +1,52 @@
-Tdentry 1 64
+Tdentry 64
 qid.version 0
 qid.path 64
 size 0
 pdblkno 3
 pqpath 63
-mtime 1665241662656879014
+mtime 1666331994198684067
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name dir1
--- a/tests/test.1/blocks/19
+++ b/tests/test.1/blocks/19
@@ -1,42 +1,52 @@
-Tdentry 1 65
+Tdentry 65
 qid.version 0
 qid.path 65
 size 5
 pdblkno 18
 pqpath 64
-mtime 1665241662667052180
+mtime 1666331994200419634
 mode 666
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 20 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name file1
--- a/tests/test.1/blocks/2
+++ b/tests/test.1/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.1/blocks/20
+++ b/tests/test.1/blocks/20
@@ -1,2 +1,2 @@
-Tdata 1 65
+Tdata 65
 test
--- a/tests/test.1/blocks/21
+++ b/tests/test.1/blocks/21
@@ -1,3 +1,3 @@
-Tdata 1 15
+Tdata 15
 21 .. 21
 25 .. 28
--- a/tests/test.1/blocks/22
+++ b/tests/test.1/blocks/22
@@ -1,1 +1,1 @@
-Tdata 1 13
+Tdata 13
--- a/tests/test.1/blocks/23
+++ b/tests/test.1/blocks/23
@@ -1,4 +1,4 @@
-Tdata 1 12
+Tdata 12
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.1/blocks/24
+++ b/tests/test.1/blocks/24
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.1/blocks/25
+++ b/tests/test.1/blocks/25
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.1/blocks/26
+++ b/tests/test.1/blocks/26
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.1/blocks/27
+++ b/tests/test.1/blocks/27
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.1/blocks/28
+++ b/tests/test.1/blocks/28
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.1/blocks/29
+++ b/tests/test.1/blocks/29
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.1/blocks/3
+++ b/tests/test.1/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653238116207474527
+mtime 1666331993065555082
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 18 1
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 18
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.1/blocks/30
+++ b/tests/test.1/blocks/30
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.1/blocks/31
+++ b/tests/test.1/blocks/31
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.1/blocks/4
+++ b/tests/test.1/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653220058258327306
+mtime 1666331993065512932
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.1/blocks/5
+++ b/tests/test.1/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058259129363
+mtime 1666331993065522785
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.1/blocks/6
+++ b/tests/test.1/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058266642885
+mtime 1666331993065529141
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.1/blocks/7
+++ b/tests/test.1/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058266842352
+mtime 1666331993065530969
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.1/blocks/8
+++ b/tests/test.1/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.1/blocks/9
+++ b/tests/test.1/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058258873744
+mtime 1666331993065520481
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.2/action.rc
+++ b/tests/test.2/action.rc
@@ -8,7 +8,10 @@
 	./6.offsets -s test.2/^$t^.start -o `{cat test.2/^$t^.offset} -a test.2/^$t^.add /n/mafs_test.2/file1
 	diff /n/mafs_test.2/file1 test.2/^$t^.end
 #	{
+#		ls -l /n/mafs_test.2/file1 test.2/^$t^.end
+#		echo cat /n/mafs_test.2/file1
 #		cat /n/mafs_test.2/file1
+#		echo cat test.2/^$t^.end
 #		cat test.2/^$t^.end
 #	}
 	rm /n/mafs_test.2/file1
--- a/tests/test.2/blocks/0
+++ b/tests/test.2/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.2/blocks/1
+++ b/tests/test.2/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 20480
 nblocks 40
 backup config 1 to 39 28
--- a/tests/test.2/blocks/10
+++ b/tests/test.2/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351539603
+mtime 1666332446276265491
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 39 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 39
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.2/blocks/11
+++ b/tests/test.2/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351740745
+mtime 1666332446276270426
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 38 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 38
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.2/blocks/12
+++ b/tests/test.2/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351939374
+mtime 1666332446276272441
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 37 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 37
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.2/blocks/13
+++ b/tests/test.2/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352137164
+mtime 1666332446276277133
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 28 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 28
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.2/blocks/14
+++ b/tests/test.2/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352337469
+mtime 1666332446276279179
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 27 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 27
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.2/blocks/15
+++ b/tests/test.2/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352541126
+mtime 1666332446276281041
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 26 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 26
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.2/blocks/16
+++ b/tests/test.2/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653219675350736707
+mtime 1666332446276255503
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.2/blocks/17
+++ b/tests/test.2/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 19
 pdblkno 4
 pqpath 5
-mtime 1665241420136494979
+mtime 1666332448772732576
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.2/blocks/18
+++ b/tests/test.2/blocks/18
@@ -1,4 +1,4 @@
-Tdentry 1 0
+Tdentry 0
 qid.version 0
 qid.path 0
 size 0
@@ -10,33 +10,43 @@
 gid 0
 muid 0
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name 
--- a/tests/test.2/blocks/19
+++ b/tests/test.2/blocks/19
@@ -1,3 +1,3 @@
-Tdata 1 15
+Tdata 15
 19 .. 25
 29 .. 36
--- a/tests/test.2/blocks/2
+++ b/tests/test.2/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 72
--- a/tests/test.2/blocks/23
+++ b/tests/test.2/blocks/23
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/24
+++ b/tests/test.2/blocks/24
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/25
+++ b/tests/test.2/blocks/25
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/26
+++ b/tests/test.2/blocks/26
@@ -1,1 +1,1 @@
-Tdata 1 13
+Tdata 13
--- a/tests/test.2/blocks/27
+++ b/tests/test.2/blocks/27
@@ -1,4 +1,4 @@
-Tdata 1 12
+Tdata 12
 start 0
 tfree 0
 qidgen 72
--- a/tests/test.2/blocks/28
+++ b/tests/test.2/blocks/28
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 20480
 nblocks 40
 backup config 1 to 39 28
--- a/tests/test.2/blocks/29
+++ b/tests/test.2/blocks/29
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/3
+++ b/tests/test.2/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653238116207474527
+mtime 1666332446276286896
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 18 1
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 18
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.2/blocks/30
+++ b/tests/test.2/blocks/30
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/31
+++ b/tests/test.2/blocks/31
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/32
+++ b/tests/test.2/blocks/32
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/33
+++ b/tests/test.2/blocks/33
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/34
+++ b/tests/test.2/blocks/34
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/35
+++ b/tests/test.2/blocks/35
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/36
+++ b/tests/test.2/blocks/36
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.2/blocks/37
+++ b/tests/test.2/blocks/37
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.2/blocks/38
+++ b/tests/test.2/blocks/38
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 72
--- a/tests/test.2/blocks/39
+++ b/tests/test.2/blocks/39
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 20480
 nblocks 40
 backup config 1 to 39 28
--- a/tests/test.2/blocks/4
+++ b/tests/test.2/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653220058258327306
+mtime 1666332446276240403
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.2/blocks/5
+++ b/tests/test.2/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058259129363
+mtime 1666332446276250637
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.2/blocks/6
+++ b/tests/test.2/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058266642885
+mtime 1666332446276257203
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.2/blocks/7
+++ b/tests/test.2/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058266842352
+mtime 1666332446276259009
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.2/blocks/8
+++ b/tests/test.2/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.2/blocks/9
+++ b/tests/test.2/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058258873744
+mtime 1666332446276248096
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.3/blocks/0
+++ b/tests/test.3/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.3/blocks/1
+++ b/tests/test.3/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 20971520
 nblocks 40960
 backup config 1 to 40959 20488
--- a/tests/test.3/blocks/10
+++ b/tests/test.3/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351539603
+mtime 1666355236185882933
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 40959 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 40959
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.3/blocks/11
+++ b/tests/test.3/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351740745
+mtime 1666355236185888080
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 40958 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 40958
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.3/blocks/12
+++ b/tests/test.3/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351939374
+mtime 1666355236185889788
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 40957 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 40957
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.3/blocks/13
+++ b/tests/test.3/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352137164
+mtime 1666355236185894127
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 20488 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20488
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.3/blocks/14
+++ b/tests/test.3/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352337469
+mtime 1666355236185895736
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 20487 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20487
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.3/blocks/15
+++ b/tests/test.3/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352541126
+mtime 1666355236185900190
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 20486 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20486
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.3/blocks/16
+++ b/tests/test.3/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653219675350736707
+mtime 1666355236185869652
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.3/blocks/17
+++ b/tests/test.3/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 28
 pdblkno 4
 pqpath 5
-mtime 1665241420136494979
+mtime 1666355307752040277
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.3/blocks/18
+++ b/tests/test.3/blocks/18
@@ -1,4 +1,4 @@
-Tdentry 1 0
+Tdentry 0
 qid.version 0
 qid.path 0
 size 0
@@ -10,33 +10,43 @@
 gid 0
 muid 0
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name 
--- a/tests/test.3/blocks/2
+++ b/tests/test.3/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 74
--- a/tests/test.3/blocks/20486
+++ b/tests/test.3/blocks/20486
@@ -1,1 +1,1 @@
-Tdata 1 13
+Tdata 13
--- a/tests/test.3/blocks/20487
+++ b/tests/test.3/blocks/20487
@@ -1,4 +1,4 @@
-Tdata 1 12
+Tdata 12
 start 0
 tfree 0
 qidgen 74
--- a/tests/test.3/blocks/20488
+++ b/tests/test.3/blocks/20488
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 20971520
 nblocks 40960
 backup config 1 to 40959 20488
--- a/tests/test.3/blocks/3
+++ b/tests/test.3/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653238116207474527
+mtime 1666355236185903302
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 18 1
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 18
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.3/blocks/4
+++ b/tests/test.3/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653220058258327306
+mtime 1666355236185857383
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.3/blocks/40956
+++ b/tests/test.3/blocks/40956
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.3/blocks/40957
+++ b/tests/test.3/blocks/40957
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.3/blocks/40958
+++ b/tests/test.3/blocks/40958
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 74
--- a/tests/test.3/blocks/40959
+++ b/tests/test.3/blocks/40959
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 20971520
 nblocks 40960
 backup config 1 to 40959 20488
--- a/tests/test.3/blocks/5
+++ b/tests/test.3/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058259129363
+mtime 1666355236185867608
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.3/blocks/6
+++ b/tests/test.3/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058266642885
+mtime 1666355236185871653
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.3/blocks/7
+++ b/tests/test.3/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058266842352
+mtime 1666355236185879140
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.3/blocks/8
+++ b/tests/test.3/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.3/blocks/9
+++ b/tests/test.3/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058258873744
+mtime 1666355236185864460
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.4/blocks/0
+++ b/tests/test.4/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.5/blocks/0
+++ b/tests/test.5/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.6/blocks/0
+++ b/tests/test.6/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.6/blocks/1
+++ b/tests/test.6/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.6/blocks/10
+++ b/tests/test.6/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653302179732866209
+mtime 1666333071921971487
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 31 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 31
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.6/blocks/11
+++ b/tests/test.6/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653302179733063161
+mtime 1666333071921975242
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 30 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 30
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.6/blocks/12
+++ b/tests/test.6/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653302179733265980
+mtime 1666333071921977005
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 29 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 29
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.6/blocks/13
+++ b/tests/test.6/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653302179733463771
+mtime 1666333071921981139
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 24 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 24
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.6/blocks/14
+++ b/tests/test.6/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653302179733664914
+mtime 1666333071921983052
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 23 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 23
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.6/blocks/15
+++ b/tests/test.6/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653302179733862704
+mtime 1666333071921985035
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 22 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 22
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.6/blocks/16
+++ b/tests/test.6/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653302179732062476
+mtime 1666333071921962196
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.6/blocks/17
+++ b/tests/test.6/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 19
 pdblkno 4
 pqpath 5
-mtime 1653302181828647070
+mtime 1666333075061395120
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 21 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 21
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.6/blocks/18
+++ b/tests/test.6/blocks/18
@@ -1,42 +1,52 @@
-Tdentry 1 64
+Tdentry 64
 qid.version 0
 qid.path 64
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653302180819962729
+mtime 1666333073055508391
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name dir1
--- a/tests/test.6/blocks/19
+++ b/tests/test.6/blocks/19
@@ -1,42 +1,52 @@
-Tdentry 1 65
+Tdentry 65
 qid.version 0
 qid.path 65
 size 5
 pdblkno 18
 pqpath 64
-mtime 1653302180823455071
+mtime 1666333073057214101
 mode 666
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 20 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name file1
--- a/tests/test.6/blocks/2
+++ b/tests/test.6/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.6/blocks/20
+++ b/tests/test.6/blocks/20
@@ -1,2 +1,2 @@
-Tdata 1 65
+Tdata 65
 test
--- a/tests/test.6/blocks/21
+++ b/tests/test.6/blocks/21
@@ -1,3 +1,3 @@
-Tdata 1 15
+Tdata 15
 21 .. 21
 25 .. 28
--- a/tests/test.6/blocks/22
+++ b/tests/test.6/blocks/22
@@ -1,1 +1,1 @@
-Tdata 1 13
+Tdata 13
--- a/tests/test.6/blocks/23
+++ b/tests/test.6/blocks/23
@@ -1,4 +1,4 @@
-Tdata 1 12
+Tdata 12
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.6/blocks/24
+++ b/tests/test.6/blocks/24
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.6/blocks/25
+++ b/tests/test.6/blocks/25
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.6/blocks/26
+++ b/tests/test.6/blocks/26
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.6/blocks/27
+++ b/tests/test.6/blocks/27
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.6/blocks/28
+++ b/tests/test.6/blocks/28
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.6/blocks/29
+++ b/tests/test.6/blocks/29
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.6/blocks/3
+++ b/tests/test.6/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653302179734239009
+mtime 1666333071921990810
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 18 1
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 18
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.6/blocks/30
+++ b/tests/test.6/blocks/30
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.6/blocks/31
+++ b/tests/test.6/blocks/31
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.6/blocks/4
+++ b/tests/test.6/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653302179731452342
+mtime 1666333071921947842
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.6/blocks/5
+++ b/tests/test.6/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653302179731856304
+mtime 1666333071921957575
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.6/blocks/6
+++ b/tests/test.6/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653302179732266971
+mtime 1666333071921963905
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.6/blocks/7
+++ b/tests/test.6/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653302179732466438
+mtime 1666333071921965758
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.6/blocks/8
+++ b/tests/test.6/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.6/blocks/9
+++ b/tests/test.6/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653302179731657676
+mtime 1666333071921955379
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.7/blocks/0
+++ b/tests/test.7/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.8/blocks/0
+++ b/tests/test.8/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.8/blocks/1
+++ b/tests/test.8/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 13312
 nblocks 26
 backup config 1 to 25 21
--- a/tests/test.8/blocks/10
+++ b/tests/test.8/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653301446265633593
+mtime 1666333567328049920
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 25 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 25
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.8/blocks/11
+++ b/tests/test.8/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653301446266319993
+mtime 1666333567328054661
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 24 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 24
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.8/blocks/12
+++ b/tests/test.8/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653301446266654393
+mtime 1666333567328056600
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 23 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 23
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.8/blocks/13
+++ b/tests/test.8/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653301446267429631
+mtime 1666333567328061403
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 21 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 21
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.8/blocks/14
+++ b/tests/test.8/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653301446268050659
+mtime 1666333567328063282
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 20 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.8/blocks/15
+++ b/tests/test.8/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653301446268320526
+mtime 1666333567328064911
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.8/blocks/16
+++ b/tests/test.8/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653077828956823136
+mtime 1666333567328040143
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.8/blocks/17
+++ b/tests/test.8/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 19
 pdblkno 4
 pqpath 5
-mtime 1653219331339126751
+mtime 1666333569449739119
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 18 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 18
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.8/blocks/2
+++ b/tests/test.8/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 64
--- a/tests/test.8/blocks/21
+++ b/tests/test.8/blocks/21
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 13312
 nblocks 26
 backup config 1 to 25 21
--- a/tests/test.8/blocks/22
+++ b/tests/test.8/blocks/22
@@ -1,1 +1,1 @@
-Tblank 0 0
+Tblank 0
--- a/tests/test.8/blocks/23
+++ b/tests/test.8/blocks/23
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.8/blocks/24
+++ b/tests/test.8/blocks/24
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 64
--- a/tests/test.8/blocks/25
+++ b/tests/test.8/blocks/25
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 13312
 nblocks 26
 backup config 1 to 25 21
--- a/tests/test.8/blocks/3
+++ b/tests/test.8/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653078704020709001
+mtime 1666333567328070657
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.8/blocks/4
+++ b/tests/test.8/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653078593182939124
+mtime 1666333567328025870
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.8/blocks/5
+++ b/tests/test.8/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653078593183338057
+mtime 1666333567328035539
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.8/blocks/6
+++ b/tests/test.8/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653078593183740343
+mtime 1666333567328041839
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.8/blocks/7
+++ b/tests/test.8/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653078593184139276
+mtime 1666333567328043568
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.8/blocks/8
+++ b/tests/test.8/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.8/blocks/9
+++ b/tests/test.8/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653078383484959375
+mtime 1666333567328033295
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.9/blocks/0
+++ b/tests/test.9/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.9/blocks/1
+++ b/tests/test.9/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 67108864
 nblocks 131072
 backup config 1 to 131071 65544
--- a/tests/test.9/blocks/10
+++ b/tests/test.9/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1665439208877103386
+mtime 1666333673570015211
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 131071 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 131071
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.9/blocks/11
+++ b/tests/test.9/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1665439208877871276
+mtime 1666333673570020286
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 131070 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 131070
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.9/blocks/12
+++ b/tests/test.9/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1665439208878919396
+mtime 1666333673570022487
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 131069 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 131069
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.9/blocks/13
+++ b/tests/test.9/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1665439208879718699
+mtime 1666333673570027272
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 65544 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 65544
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.9/blocks/14
+++ b/tests/test.9/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1665439208880463347
+mtime 1666333673570029174
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 65543 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 65543
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.9/blocks/15
+++ b/tests/test.9/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1665439208881253700
+mtime 1666333673570030766
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 65542 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 65542
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.9/blocks/16
+++ b/tests/test.9/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1665439208873946020
+mtime 1666333673570003927
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.9/blocks/18
+++ b/tests/test.9/blocks/18
@@ -1,42 +1,52 @@
-Tdentry 1 64
+Tdentry 64
 qid.version 0
 qid.path 64
 size 0
 pdblkno 3
 pqpath 63
-mtime 1665439210165283652
+mtime 1666333674704421454
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name dir1
--- a/tests/test.9/blocks/19
+++ b/tests/test.9/blocks/19
@@ -1,42 +1,52 @@
-Tdentry 1 65
+Tdentry 65
 qid.version 0
 qid.path 65
 size 5
 pdblkno 18
 pqpath 64
-mtime 1665439210175468727
+mtime 1666333674706180994
 mode 666
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 20 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name file1
--- a/tests/test.9/blocks/2
+++ b/tests/test.9/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 73
--- a/tests/test.9/blocks/20
+++ b/tests/test.9/blocks/20
@@ -1,2 +1,2 @@
-Tdata 1 65
+Tdata 65
 test
--- a/tests/test.9/blocks/21
+++ b/tests/test.9/blocks/21
@@ -1,42 +1,52 @@
-Tdentry 1 66
+Tdentry 66
 qid.version 0
 qid.path 66
 size 0
 pdblkno 3
 pqpath 63
-mtime 1665439210177489233
+mtime 1666333674706993323
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 22 1
-	1 24 1
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 22
+	1 24
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name dir2
--- a/tests/test.9/blocks/22
+++ b/tests/test.9/blocks/22
@@ -1,42 +1,52 @@
-Tdentry 1 67
+Tdentry 67
 qid.version 0
 qid.path 67
 size 5
 pdblkno 21
 pqpath 66
-mtime 1665439210187624634
+mtime 1666333674708733739
 mode 666
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 23 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 23
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name file1
--- a/tests/test.9/blocks/23
+++ b/tests/test.9/blocks/23
@@ -1,2 +1,2 @@
-Tdata 1 67
+Tdata 67
 test
--- a/tests/test.9/blocks/24
+++ b/tests/test.9/blocks/24
@@ -1,42 +1,52 @@
-Tdentry 1 68
+Tdentry 68
 qid.version 0
 qid.path 68
 size 5
 pdblkno 21
 pqpath 66
-mtime 1665439210198461393
+mtime 1666333674710433311
 mode 666
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 25 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 25
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name file2
--- a/tests/test.9/blocks/25
+++ b/tests/test.9/blocks/25
@@ -1,2 +1,2 @@
-Tdata 1 68
+Tdata 68
 test
--- a/tests/test.9/blocks/26
+++ b/tests/test.9/blocks/26
@@ -1,42 +1,52 @@
-Tdentry 1 69
+Tdentry 69
 qid.version 0
 qid.path 69
 size 0
 pdblkno 3
 pqpath 63
-mtime 1665439210200117795
+mtime 1666333674711196162
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 27 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 27
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name dir3
--- a/tests/test.9/blocks/4
+++ b/tests/test.9/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1665439208871579306
+mtime 1666333673569989325
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.9/blocks/5
+++ b/tests/test.9/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1665439208873139440
+mtime 1666333673569998952
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.9/blocks/6
+++ b/tests/test.9/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1665439208874749502
+mtime 1666333673570005850
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.9/blocks/7
+++ b/tests/test.9/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1665439208875572144
+mtime 1666333673570007807
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.9/blocks/8
+++ b/tests/test.9/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.9/blocks/9
+++ b/tests/test.9/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1665439208872376355
+mtime 1666333673569996436
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.b/blocks/0
+++ b/tests/test.b/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.b/blocks/1
+++ b/tests/test.b/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.b/blocks/10
+++ b/tests/test.b/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351539603
+mtime 1666359855817803137
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 31 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 31
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.b/blocks/11
+++ b/tests/test.b/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351740745
+mtime 1666359855817807985
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 30 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 30
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.b/blocks/12
+++ b/tests/test.b/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351939374
+mtime 1666359855817810192
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 29 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 29
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.b/blocks/13
+++ b/tests/test.b/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352137164
+mtime 1666359855817814624
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 24 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 24
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.b/blocks/14
+++ b/tests/test.b/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352337469
+mtime 1666359855817816538
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 23 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 23
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.b/blocks/15
+++ b/tests/test.b/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352541126
+mtime 1666359855817818278
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 22 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 22
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.b/blocks/16
+++ b/tests/test.b/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653219675350736707
+mtime 1666359855817792612
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.b/blocks/17
+++ b/tests/test.b/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 19
 pdblkno 4
 pqpath 5
-mtime 1665241420136494979
+mtime 1666359857958456895
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 21 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 21
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.b/blocks/18
+++ b/tests/test.b/blocks/18
@@ -1,42 +1,52 @@
-Tdentry 1 64
+Tdentry 64
 qid.version 0
 qid.path 64
 size 0
 pdblkno 3
 pqpath 63
-mtime 1665241662656879014
+mtime 1666359856952636997
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name dir1
--- a/tests/test.b/blocks/19
+++ b/tests/test.b/blocks/19
@@ -1,42 +1,52 @@
-Tdentry 1 65
+Tdentry 65
 qid.version 0
 qid.path 65
 size 5
 pdblkno 18
 pqpath 64
-mtime 1665241662667052180
+mtime 1666359856954554520
 mode 666
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 20 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name file1
--- a/tests/test.b/blocks/2
+++ b/tests/test.b/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.b/blocks/20
+++ b/tests/test.b/blocks/20
@@ -1,2 +1,2 @@
-Tdata 1 65
+Tdata 65
 test
--- a/tests/test.b/blocks/21
+++ b/tests/test.b/blocks/21
@@ -1,3 +1,3 @@
-Tdata 1 15
+Tdata 15
 21 .. 21
 25 .. 28
--- a/tests/test.b/blocks/22
+++ b/tests/test.b/blocks/22
@@ -1,1 +1,1 @@
-Tdata 1 13
+Tdata 13
--- a/tests/test.b/blocks/23
+++ b/tests/test.b/blocks/23
@@ -1,4 +1,4 @@
-Tdata 1 12
+Tdata 12
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.b/blocks/24
+++ b/tests/test.b/blocks/24
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.b/blocks/29
+++ b/tests/test.b/blocks/29
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.b/blocks/3
+++ b/tests/test.b/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653238116207474527
+mtime 1666359855817824186
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 18 1
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 18
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.b/blocks/30
+++ b/tests/test.b/blocks/30
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 66
--- a/tests/test.b/blocks/31
+++ b/tests/test.b/blocks/31
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.b/blocks/4
+++ b/tests/test.b/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653220058258327306
+mtime 1666359855817772556
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.b/blocks/5
+++ b/tests/test.b/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058259129363
+mtime 1666359855817787129
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.b/blocks/6
+++ b/tests/test.b/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058266642885
+mtime 1666359855817794308
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.b/blocks/7
+++ b/tests/test.b/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058266842352
+mtime 1666359855817796251
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.b/blocks/8
+++ b/tests/test.b/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.b/blocks/9
+++ b/tests/test.b/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058258873744
+mtime 1666359855817784126
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/tests/test.d/blocks/0
+++ b/tests/test.d/blocks/0
@@ -1,4 +1,3 @@
-Tmagic 1 1
+Tmagic 1
 mafs device
 512
-8180
--- a/tests/test.d/blocks/1
+++ b/tests/test.d/blocks/1
@@ -1,4 +1,4 @@
-Tdata 1 2
+Tdata 2
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.d/blocks/10
+++ b/tests/test.d/blocks/10
@@ -1,42 +1,52 @@
-Tdentry 1 8
+Tdentry 8
 qid.version 0
 qid.path 8
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351539603
+mtime 1666359865759946606
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 31 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 31
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.0
--- a/tests/test.d/blocks/11
+++ b/tests/test.d/blocks/11
@@ -1,42 +1,52 @@
-Tdentry 1 9
+Tdentry 9
 qid.version 0
 qid.path 9
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351740745
+mtime 1666359865759948486
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 30 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 30
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.0
--- a/tests/test.d/blocks/12
+++ b/tests/test.d/blocks/12
@@ -1,42 +1,52 @@
-Tdentry 1 10
+Tdentry 10
 qid.version 0
 qid.path 10
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675351939374
+mtime 1666359865759953319
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 29 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 29
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.0
--- a/tests/test.d/blocks/13
+++ b/tests/test.d/blocks/13
@@ -1,42 +1,52 @@
-Tdentry 1 11
+Tdentry 11
 qid.version 0
 qid.path 11
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352137164
+mtime 1666359865759955235
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 24 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 24
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config.1
--- a/tests/test.d/blocks/14
+++ b/tests/test.d/blocks/14
@@ -1,42 +1,52 @@
-Tdentry 1 12
+Tdentry 12
 qid.version 0
 qid.path 12
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352337469
+mtime 1666359865759956872
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 23 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 23
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super.1
--- a/tests/test.d/blocks/15
+++ b/tests/test.d/blocks/15
@@ -1,42 +1,52 @@
-Tdentry 1 13
+Tdentry 13
 qid.version 0
 qid.path 13
-size 500
+size 502
 pdblkno 9
 pqpath 7
-mtime 1653219675352541126
+mtime 1666359865759962493
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 22 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 22
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name root.1
--- a/tests/test.d/blocks/16
+++ b/tests/test.d/blocks/16
@@ -1,42 +1,52 @@
-Tdentry 1 14
+Tdentry 14
 qid.version 0
 qid.path 14
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653219675350736707
+mtime 1666359865759931465
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 0 0
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 0
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name ctl
--- a/tests/test.d/blocks/17
+++ b/tests/test.d/blocks/17
@@ -1,42 +1,52 @@
-Tdentry 1 15
+Tdentry 15
 qid.version 0
 qid.path 15
 size 10
 pdblkno 4
 pqpath 5
-mtime 1665241420136494979
+mtime 1666359868040073037
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 28 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 28
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name frees
--- a/tests/test.d/blocks/18
+++ b/tests/test.d/blocks/18
@@ -1,42 +1,52 @@
-Tdentry 1 64
+Tdentry 64
 qid.version 0
 qid.path 64
 size 0
 pdblkno 3
 pqpath 63
-mtime 1665241662656879014
+mtime 1666359866898311852
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 19 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 19
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name a
--- a/tests/test.d/blocks/19
+++ b/tests/test.d/blocks/19
@@ -1,42 +1,52 @@
-Tdentry 1 65
+Tdentry 65
 qid.version 0
 qid.path 65
 size 0
 pdblkno 18
 pqpath 64
-mtime 1665241662667052180
+mtime 1666359866898658433
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 20 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 20
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name b
--- a/tests/test.d/blocks/2
+++ b/tests/test.d/blocks/2
@@ -1,4 +1,4 @@
-Tdata 1 3
+Tdata 3
 start 0
 tfree 0
 qidgen 71
--- a/tests/test.d/blocks/20
+++ b/tests/test.d/blocks/20
@@ -1,42 +1,52 @@
-Tdentry 1 66
+Tdentry 66
 qid.version 0
 qid.path 66
 size 0
 pdblkno 19
 pqpath 65
-mtime 1665746544536952697
+mtime 1666359866898986491
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 21 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 21
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name c
--- a/tests/test.d/blocks/21
+++ b/tests/test.d/blocks/21
@@ -1,42 +1,52 @@
-Tdentry 1 67
+Tdentry 67
 qid.version 0
 qid.path 67
 size 0
 pdblkno 20
 pqpath 66
-mtime 1665746126741347088
+mtime 1666359866899370728
 mode 20000000777
 uid 10006
 gid -1
 muid 10006
 direct spans
-	0 25 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 25
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name d
--- a/tests/test.d/blocks/22
+++ b/tests/test.d/blocks/22
@@ -1,1 +1,1 @@
-Tdata 1 13
+Tdata 13
--- a/tests/test.d/blocks/23
+++ b/tests/test.d/blocks/23
@@ -1,4 +1,4 @@
-Tdata 1 12
+Tdata 12
 start 0
 tfree 0
 qidgen 71
--- a/tests/test.d/blocks/24
+++ b/tests/test.d/blocks/24
@@ -1,4 +1,4 @@
-Tdata 1 11
+Tdata 11
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.d/blocks/29
+++ b/tests/test.d/blocks/29
@@ -1,1 +1,1 @@
-Tdata 1 10
+Tdata 10
--- a/tests/test.d/blocks/3
+++ b/tests/test.d/blocks/3
@@ -1,42 +1,52 @@
-Tdentry 1 63
+Tdentry 63
 qid.version 0
 qid.path 63
 size 0
 pdblkno 0
 pqpath 0
-mtime 1653238116207474527
+mtime 1666359865759968192
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 4 1
-	1 18 1
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 4
+	1 18
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name /
--- a/tests/test.d/blocks/30
+++ b/tests/test.d/blocks/30
@@ -1,4 +1,4 @@
-Tdata 1 9
+Tdata 9
 start 0
 tfree 0
 qidgen 71
--- a/tests/test.d/blocks/31
+++ b/tests/test.d/blocks/31
@@ -1,4 +1,4 @@
-Tdata 1 8
+Tdata 8
 size 16384
 nblocks 32
 backup config 1 to 31 24
--- a/tests/test.d/blocks/4
+++ b/tests/test.d/blocks/4
@@ -1,42 +1,52 @@
-Tdentry 1 5
+Tdentry 5
 qid.version 0
 qid.path 5
 size 0
 pdblkno 3
 pqpath 63
-mtime 1653220058258327306
+mtime 1666359865759923176
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 9 1
-	1 5 1
-	2 16 1
-	3 6 1
-	4 7 1
-	5 17 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 9
+	1 5
+	2 16
+	3 6
+	4 7
+	5 17
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name adm
--- a/tests/test.d/blocks/5
+++ b/tests/test.d/blocks/5
@@ -1,42 +1,52 @@
-Tdentry 1 2
+Tdentry 2
 qid.version 0
 qid.path 2
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058259129363
+mtime 1666359865759929589
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 1 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 1
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name config
--- a/tests/test.d/blocks/6
+++ b/tests/test.d/blocks/6
@@ -1,42 +1,52 @@
-Tdentry 1 3
+Tdentry 3
 qid.version 0
 qid.path 3
 size 0
 pdblkno 4
 pqpath 5
-mtime 1653220058266642885
+mtime 1666359865759933393
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 2 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 2
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name super
--- a/tests/test.d/blocks/7
+++ b/tests/test.d/blocks/7
@@ -1,42 +1,52 @@
-Tdentry 1 6
+Tdentry 6
 qid.version 0
 qid.path 6
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058266842352
+mtime 1666359865759939962
 mode 444
 uid -1
 gid -1
 muid -1
 direct spans
-	0 8 1
-	1 0 0
-	2 0 0
-	3 0 0
-	4 0 0
-	5 0 0
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 8
+	1 0
+	2 0
+	3 0
+	4 0
+	5 0
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name users
--- a/tests/test.d/blocks/8
+++ b/tests/test.d/blocks/8
@@ -1,4 +1,4 @@
-Tdata 1 6
+Tdata 6
 -1:adm:adm:
 0:none:adm:
 9999:noworld::
--- a/tests/test.d/blocks/9
+++ b/tests/test.d/blocks/9
@@ -1,42 +1,52 @@
-Tdentry 1 7
+Tdentry 7
 qid.version 0
 qid.path 7
 size 126
 pdblkno 4
 pqpath 5
-mtime 1653220058258873744
+mtime 1666359865759927105
 mode 20000000777
 uid -1
 gid -1
 muid -1
 direct spans
-	0 10 1
-	1 11 1
-	2 12 1
-	3 13 1
-	4 14 1
-	5 15 1
-	6 0 0
-	7 0 0
-	8 0 0
-	9 0 0
-	10 0 0
-	11 0 0
-	12 0 0
-	13 0 0
-	14 0 0
-	15 0 0
-	16 0 0
-	17 0 0
-	18 0 0
-	19 0 0
-	20 0 0
-	21 0 0
-	22 0 0
-	23 0 0
+	0 10
+	1 11
+	2 12
+	3 13
+	4 14
+	5 15
+	6 0
+	7 0
+	8 0
+	9 0
+	10 0
+	11 0
+	12 0
+	13 0
+	14 0
+	15 0
+	16 0
+	17 0
+	18 0
+	19 0
+	20 0
+	21 0
+	22 0
+	23 0
+	24 0
+	25 0
+	26 0
+	27 0
+	28 0
+	29 0
+	30 0
+	31 0
 indirect blocks
 	0 0
 	1 0
 	2 0
 	3 0
+	4 0
+	5 0
 name bkp
--- a/used.c
+++ b/used.c
@@ -56,8 +56,6 @@
 int
 checkvalid(u64 blkno, Tag *t, s16 tagtype, u64 qpath)
 {
-	u16 i;
-
 	if(t->type != tagtype || t->path != qpath || t->dirty != 0){
 		/* if(debug) */
 		fprint(2, "checkblock invalid %llud tag/path expected %s/%llud actual %s/%llud dirty %d\n",
@@ -66,10 +64,8 @@
 		return 0;
 	}
 	if(debug)
-		print("blkno %llud len %d tag %s\n", blkno, t->len, tagnames[t->type]);
-	for(i = 0; i < t->len; i++){
-		print("%llud\n", blkno+i);
-	}
+		print("blkno %llud tag %s\n", blkno, tagnames[t->type]);
+	print("%llud\n", blkno);
 	return 1;
 }
 
--- a/writer.c
+++ b/writer.c
@@ -123,10 +123,9 @@
 		if(chatty9p > 4)
 			stats();
 	}
-	w = emalloc9p(sizeof(Wbuf)+(b->len*Rawblocksize));
+	w = emalloc9p(sizeof(Wbuf)+Rawblocksize);
 	w->blkno = b->blkno;
-	w->len = b->len;
-	memcpy(&w->io, b->io, b->len*Rawblocksize);
+	memcpy(&w->io, b->io, Rawblocksize);
 	if(drts.head == nil){
 		drts.head = drts.tail = w;
 	}else{