code: mafs

Download patch

ref: bb9df261cba0e42df6178850d7479dd162d742d6
parent: ae0459c6e838ef75cba4b3ee59921896fb618ca0
author: 9ferno <gophone2015@gmail.com>
date: Fri Oct 21 13:40:40 EDT 2022

renamed a field in the block output

--- a/blk.c
+++ b/blk.c
@@ -30,7 +30,7 @@
 	fprint(fd, "uid %d\n", d->uid);
 	fprint(fd, "gid %d\n", d->gid);
 	fprint(fd, "muid %d\n", d->muid);
-	fprint(fd, "direct spans\n");
+	fprint(fd, "direct blocks\n");
 	for(j = 0; j<Ndblock; j++)
 		fprint(fd, "	%d %llud\n", j, d->dblocks[j]);
 	fprint(fd, "indirect blocks\n");
--- a/dat.h
+++ b/dat.h
@@ -70,7 +70,6 @@
 	Rawblocksize= 512ULL,	/* real block size */
 	Ndblock		= 32,	/* number of direct blocks in a Dentry */
 	Niblock		= 6,	/* max depth of indirect blocks */
-	/* from tests/sizes.c, this provides 12M data spans */
 
 	/* global block numbers. The bkp contents locations are calculated by ream() */
 	Bmagicb	= 0,	/* block number of first block. Bmagic conflicts with bio.h */
@@ -359,7 +358,7 @@
 	Tind2,		/* points to Tind1 blocks */
 	Tind3,		/* list of Tind2 blocks */
 	Tind4,		/* list of Tind3 blocks */
-	Tind5,		/* list of Tind4 blocks */
+	Tind5,		/* list of Tind4 blocks, maximum file size 26 TiB */
 	Maxtind,	/* should be Tind0+Niblock */
 				/* gap for more indirect block depth in future */
 	MAXTAG,
--- a/tests/test.0/blocks/10
+++ b/tests/test.0/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 31
 	1 0
 	2 0
--- a/tests/test.0/blocks/11
+++ b/tests/test.0/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 30
 	1 0
 	2 0
--- a/tests/test.0/blocks/12
+++ b/tests/test.0/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 29
 	1 0
 	2 0
--- a/tests/test.0/blocks/13
+++ b/tests/test.0/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 24
 	1 0
 	2 0
--- a/tests/test.0/blocks/14
+++ b/tests/test.0/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 23
 	1 0
 	2 0
--- a/tests/test.0/blocks/15
+++ b/tests/test.0/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 22
 	1 0
 	2 0
--- a/tests/test.0/blocks/16
+++ b/tests/test.0/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.0/blocks/17
+++ b/tests/test.0/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 18
 	1 0
 	2 0
--- a/tests/test.0/blocks/3
+++ b/tests/test.0/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 0
 	2 0
--- a/tests/test.0/blocks/4
+++ b/tests/test.0/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.0/blocks/5
+++ b/tests/test.0/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.0/blocks/6
+++ b/tests/test.0/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.0/blocks/7
+++ b/tests/test.0/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.0/blocks/9
+++ b/tests/test.0/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.1/blocks/10
+++ b/tests/test.1/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 31
 	1 0
 	2 0
--- a/tests/test.1/blocks/11
+++ b/tests/test.1/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 30
 	1 0
 	2 0
--- a/tests/test.1/blocks/12
+++ b/tests/test.1/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 29
 	1 0
 	2 0
--- a/tests/test.1/blocks/13
+++ b/tests/test.1/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 24
 	1 0
 	2 0
--- a/tests/test.1/blocks/14
+++ b/tests/test.1/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 23
 	1 0
 	2 0
--- a/tests/test.1/blocks/15
+++ b/tests/test.1/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 22
 	1 0
 	2 0
--- a/tests/test.1/blocks/16
+++ b/tests/test.1/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.1/blocks/17
+++ b/tests/test.1/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 21
 	1 0
 	2 0
--- a/tests/test.1/blocks/18
+++ b/tests/test.1/blocks/18
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.1/blocks/19
+++ b/tests/test.1/blocks/19
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 20
 	1 0
 	2 0
--- a/tests/test.1/blocks/3
+++ b/tests/test.1/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 18
 	2 0
--- a/tests/test.1/blocks/4
+++ b/tests/test.1/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.1/blocks/5
+++ b/tests/test.1/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.1/blocks/6
+++ b/tests/test.1/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.1/blocks/7
+++ b/tests/test.1/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.1/blocks/9
+++ b/tests/test.1/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.2/blocks/10
+++ b/tests/test.2/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 39
 	1 0
 	2 0
--- a/tests/test.2/blocks/11
+++ b/tests/test.2/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 38
 	1 0
 	2 0
--- a/tests/test.2/blocks/12
+++ b/tests/test.2/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 37
 	1 0
 	2 0
--- a/tests/test.2/blocks/13
+++ b/tests/test.2/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 28
 	1 0
 	2 0
--- a/tests/test.2/blocks/14
+++ b/tests/test.2/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 27
 	1 0
 	2 0
--- a/tests/test.2/blocks/15
+++ b/tests/test.2/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 26
 	1 0
 	2 0
--- a/tests/test.2/blocks/16
+++ b/tests/test.2/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.2/blocks/17
+++ b/tests/test.2/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.2/blocks/18
+++ b/tests/test.2/blocks/18
@@ -9,7 +9,7 @@
 uid 0
 gid 0
 muid 0
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.2/blocks/3
+++ b/tests/test.2/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 18
 	2 0
--- a/tests/test.2/blocks/4
+++ b/tests/test.2/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.2/blocks/5
+++ b/tests/test.2/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.2/blocks/6
+++ b/tests/test.2/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.2/blocks/7
+++ b/tests/test.2/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.2/blocks/9
+++ b/tests/test.2/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.3/blocks/10
+++ b/tests/test.3/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 40959
 	1 0
 	2 0
--- a/tests/test.3/blocks/11
+++ b/tests/test.3/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 40958
 	1 0
 	2 0
--- a/tests/test.3/blocks/12
+++ b/tests/test.3/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 40957
 	1 0
 	2 0
--- a/tests/test.3/blocks/13
+++ b/tests/test.3/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 20488
 	1 0
 	2 0
--- a/tests/test.3/blocks/14
+++ b/tests/test.3/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 20487
 	1 0
 	2 0
--- a/tests/test.3/blocks/15
+++ b/tests/test.3/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 20486
 	1 0
 	2 0
--- a/tests/test.3/blocks/16
+++ b/tests/test.3/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.3/blocks/17
+++ b/tests/test.3/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.3/blocks/18
+++ b/tests/test.3/blocks/18
@@ -9,7 +9,7 @@
 uid 0
 gid 0
 muid 0
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.3/blocks/3
+++ b/tests/test.3/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 18
 	2 0
--- a/tests/test.3/blocks/4
+++ b/tests/test.3/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.3/blocks/5
+++ b/tests/test.3/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.3/blocks/6
+++ b/tests/test.3/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.3/blocks/7
+++ b/tests/test.3/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.3/blocks/9
+++ b/tests/test.3/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.6/blocks/10
+++ b/tests/test.6/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 31
 	1 0
 	2 0
--- a/tests/test.6/blocks/11
+++ b/tests/test.6/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 30
 	1 0
 	2 0
--- a/tests/test.6/blocks/12
+++ b/tests/test.6/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 29
 	1 0
 	2 0
--- a/tests/test.6/blocks/13
+++ b/tests/test.6/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 24
 	1 0
 	2 0
--- a/tests/test.6/blocks/14
+++ b/tests/test.6/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 23
 	1 0
 	2 0
--- a/tests/test.6/blocks/15
+++ b/tests/test.6/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 22
 	1 0
 	2 0
--- a/tests/test.6/blocks/16
+++ b/tests/test.6/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.6/blocks/17
+++ b/tests/test.6/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 21
 	1 0
 	2 0
--- a/tests/test.6/blocks/18
+++ b/tests/test.6/blocks/18
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.6/blocks/19
+++ b/tests/test.6/blocks/19
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 20
 	1 0
 	2 0
--- a/tests/test.6/blocks/3
+++ b/tests/test.6/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 18
 	2 0
--- a/tests/test.6/blocks/4
+++ b/tests/test.6/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.6/blocks/5
+++ b/tests/test.6/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.6/blocks/6
+++ b/tests/test.6/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.6/blocks/7
+++ b/tests/test.6/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.6/blocks/9
+++ b/tests/test.6/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.8/blocks/10
+++ b/tests/test.8/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 25
 	1 0
 	2 0
--- a/tests/test.8/blocks/11
+++ b/tests/test.8/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 24
 	1 0
 	2 0
--- a/tests/test.8/blocks/12
+++ b/tests/test.8/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 23
 	1 0
 	2 0
--- a/tests/test.8/blocks/13
+++ b/tests/test.8/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 21
 	1 0
 	2 0
--- a/tests/test.8/blocks/14
+++ b/tests/test.8/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 20
 	1 0
 	2 0
--- a/tests/test.8/blocks/15
+++ b/tests/test.8/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.8/blocks/16
+++ b/tests/test.8/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.8/blocks/17
+++ b/tests/test.8/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 18
 	1 0
 	2 0
--- a/tests/test.8/blocks/3
+++ b/tests/test.8/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 0
 	2 0
--- a/tests/test.8/blocks/4
+++ b/tests/test.8/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.8/blocks/5
+++ b/tests/test.8/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.8/blocks/6
+++ b/tests/test.8/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.8/blocks/7
+++ b/tests/test.8/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.8/blocks/9
+++ b/tests/test.8/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.9/blocks/10
+++ b/tests/test.9/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 131071
 	1 0
 	2 0
--- a/tests/test.9/blocks/11
+++ b/tests/test.9/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 131070
 	1 0
 	2 0
--- a/tests/test.9/blocks/12
+++ b/tests/test.9/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 131069
 	1 0
 	2 0
--- a/tests/test.9/blocks/13
+++ b/tests/test.9/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 65544
 	1 0
 	2 0
--- a/tests/test.9/blocks/14
+++ b/tests/test.9/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 65543
 	1 0
 	2 0
--- a/tests/test.9/blocks/15
+++ b/tests/test.9/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 65542
 	1 0
 	2 0
--- a/tests/test.9/blocks/16
+++ b/tests/test.9/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.9/blocks/18
+++ b/tests/test.9/blocks/18
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.9/blocks/19
+++ b/tests/test.9/blocks/19
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 20
 	1 0
 	2 0
--- a/tests/test.9/blocks/21
+++ b/tests/test.9/blocks/21
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 22
 	1 24
 	2 0
--- a/tests/test.9/blocks/22
+++ b/tests/test.9/blocks/22
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 23
 	1 0
 	2 0
--- a/tests/test.9/blocks/24
+++ b/tests/test.9/blocks/24
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 25
 	1 0
 	2 0
--- a/tests/test.9/blocks/26
+++ b/tests/test.9/blocks/26
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 27
 	1 0
 	2 0
--- a/tests/test.9/blocks/4
+++ b/tests/test.9/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.9/blocks/5
+++ b/tests/test.9/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.9/blocks/6
+++ b/tests/test.9/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.9/blocks/7
+++ b/tests/test.9/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.9/blocks/9
+++ b/tests/test.9/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.b/blocks/10
+++ b/tests/test.b/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 31
 	1 0
 	2 0
--- a/tests/test.b/blocks/11
+++ b/tests/test.b/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 30
 	1 0
 	2 0
--- a/tests/test.b/blocks/12
+++ b/tests/test.b/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 29
 	1 0
 	2 0
--- a/tests/test.b/blocks/13
+++ b/tests/test.b/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 24
 	1 0
 	2 0
--- a/tests/test.b/blocks/14
+++ b/tests/test.b/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 23
 	1 0
 	2 0
--- a/tests/test.b/blocks/15
+++ b/tests/test.b/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 22
 	1 0
 	2 0
--- a/tests/test.b/blocks/16
+++ b/tests/test.b/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.b/blocks/17
+++ b/tests/test.b/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 21
 	1 0
 	2 0
--- a/tests/test.b/blocks/18
+++ b/tests/test.b/blocks/18
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.b/blocks/19
+++ b/tests/test.b/blocks/19
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 20
 	1 0
 	2 0
--- a/tests/test.b/blocks/3
+++ b/tests/test.b/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 18
 	2 0
--- a/tests/test.b/blocks/4
+++ b/tests/test.b/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.b/blocks/5
+++ b/tests/test.b/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.b/blocks/6
+++ b/tests/test.b/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.b/blocks/7
+++ b/tests/test.b/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.b/blocks/9
+++ b/tests/test.b/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12
--- a/tests/test.d/blocks/10
+++ b/tests/test.d/blocks/10
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 31
 	1 0
 	2 0
--- a/tests/test.d/blocks/11
+++ b/tests/test.d/blocks/11
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 30
 	1 0
 	2 0
--- a/tests/test.d/blocks/12
+++ b/tests/test.d/blocks/12
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 29
 	1 0
 	2 0
--- a/tests/test.d/blocks/13
+++ b/tests/test.d/blocks/13
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 24
 	1 0
 	2 0
--- a/tests/test.d/blocks/14
+++ b/tests/test.d/blocks/14
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 23
 	1 0
 	2 0
--- a/tests/test.d/blocks/15
+++ b/tests/test.d/blocks/15
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 22
 	1 0
 	2 0
--- a/tests/test.d/blocks/16
+++ b/tests/test.d/blocks/16
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 0
 	1 0
 	2 0
--- a/tests/test.d/blocks/17
+++ b/tests/test.d/blocks/17
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 28
 	1 0
 	2 0
--- a/tests/test.d/blocks/18
+++ b/tests/test.d/blocks/18
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 19
 	1 0
 	2 0
--- a/tests/test.d/blocks/19
+++ b/tests/test.d/blocks/19
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 20
 	1 0
 	2 0
--- a/tests/test.d/blocks/20
+++ b/tests/test.d/blocks/20
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 21
 	1 0
 	2 0
--- a/tests/test.d/blocks/21
+++ b/tests/test.d/blocks/21
@@ -9,7 +9,7 @@
 uid 10006
 gid -1
 muid 10006
-direct spans
+direct blocks
 	0 25
 	1 0
 	2 0
--- a/tests/test.d/blocks/3
+++ b/tests/test.d/blocks/3
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 4
 	1 18
 	2 0
--- a/tests/test.d/blocks/4
+++ b/tests/test.d/blocks/4
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 9
 	1 5
 	2 16
--- a/tests/test.d/blocks/5
+++ b/tests/test.d/blocks/5
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 1
 	1 0
 	2 0
--- a/tests/test.d/blocks/6
+++ b/tests/test.d/blocks/6
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 2
 	1 0
 	2 0
--- a/tests/test.d/blocks/7
+++ b/tests/test.d/blocks/7
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 8
 	1 0
 	2 0
--- a/tests/test.d/blocks/9
+++ b/tests/test.d/blocks/9
@@ -9,7 +9,7 @@
 uid -1
 gid -1
 muid -1
-direct spans
+direct blocks
 	0 10
 	1 11
 	2 12