ChangeLog, expect.1, expect.2, image.gz:

  f_expand: Make test case better by testing increasing the size of
  	lost+found where an indirect block must be created.  Also add checks
  	to see what happens when directories are disconnected because their
  	containing directory is destroyed (turned into a socket :-)
  f_dupfsblks: Add additional test cases where files share duplicate
  	blocks with both other files and filesystem metadata.

3 files changed, 32 insertions, 7 deletions

diff --git a/tests/f_dupfsblks/expect.1 b/tests/f_dupfsblks/expect.1
index 1249f395..caa090d0 100644
--- a/tests/f_dupfsblks/expect.1
+++ b/tests/f_dupfsblks/expect.1
@@ -1,16 +1,36 @@
 Filesystem did not have a UUID; generating one.
 
 Pass 1: Checking inodes, blocks, and sizes
+Inode 12, i_size is 4096, should be 5120.  Fix? yes
+
+Inode 13, i_size is 0, should be 2048.  Fix? yes
+
 Duplicate blocks found... invoking duplicate block passes.
 Pass 1B: Rescan for duplicate/bad blocks
-Duplicate/bad block(s) in inode 12: 3 4 6
+Duplicate/bad block(s) in inode 12: 3 4 6 1
+Duplicate/bad block(s) in inode 13: 2 3
+Duplicate/bad block(s) in inode 14: 2
 Pass 1C: Scan directories for inodes with dup blocks.
 Pass 1D: Reconciling duplicate blocks
-(There are 1 inodes containing duplicate/bad blocks.)
+(There are 3 inodes containing duplicate/bad blocks.)
+
+File /quux (inode #14, mod time Thu Aug  5 07:18:09 1999) 
+  has 1 duplicate block(s), shared with 2 file(s):
+	<filesystem metadata>
+	/bar (inode #13, mod time Thu Aug  5 07:17:17 1999)
+Clone duplicate/bad blocks? yes
+
+File /bar (inode #13, mod time Thu Aug  5 07:17:17 1999) 
+  has 2 duplicate block(s), shared with 3 file(s):
+	<filesystem metadata>
+	/quux (inode #14, mod time Thu Aug  5 07:18:09 1999)
+	/foo (inode #12, mod time Thu Apr 28 17:57:53 1994)
+Clone duplicate/bad blocks? yes
 
 File /foo (inode #12, mod time Thu Apr 28 17:57:53 1994) 
-  has 3 duplicate block(s), shared with 1 file(s):
+  has 4 duplicate block(s), shared with 2 file(s):
 	<filesystem metadata>
+	/bar (inode #13, mod time Thu Aug  5 07:17:17 1999)
 Clone duplicate/bad blocks? yes
 
 Pass 2: Checking directory structure
@@ -23,16 +43,21 @@ Salvage? yes
 Directory inode 12, block 3, offset 0: directory corrupted
 Salvage? yes
 
+Entry '' in ??? (12) has deleted/unused inode 32.  Clear? yes
+
+Directory inode 12, block 4, offset 100: directory corrupted
+Salvage? yes
+
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Free blocks count wrong for group #0 (77, counted=74).
+Free blocks count wrong for group #0 (77, counted=70).
 Fix? yes
 
-Free blocks count wrong (77, counted=74).
+Free blocks count wrong (77, counted=70).
 Fix? yes
 
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
-test_filesys: 12/32 files (8.3% non-contiguous), 26/100 blocks
+test_filesys: 14/32 files (7.1% non-contiguous), 30/100 blocks
 Exit status is 1
diff --git a/tests/f_dupfsblks/expect.2 b/tests/f_dupfsblks/expect.2
index 6f6d1db7..3717fec1 100644
--- a/tests/f_dupfsblks/expect.2
+++ b/tests/f_dupfsblks/expect.2
@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-test_filesys: 12/32 files (0.0% non-contiguous), 26/100 blocks
+test_filesys: 14/32 files (7.1% non-contiguous), 30/100 blocks
 Exit status is 0
diff --git a/tests/f_dupfsblks/image.gz b/tests/f_dupfsblks/image.gz
index 5514de43..109dad03 100644
--- a/tests/f_dupfsblks/image.gz
+++ b/tests/f_dupfsblks/image.gz