Many files:

  pass*.c, super.c: Massive changes to avoid using printf and com_err
  	routines.  All diagnostic messages are now routed through the
  	fix_problem interface.
  pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
  problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
  	PR_2_DUP_DOT_DOT.
  problem.c: Added new problem codes for some of the superblock
  	corruption checks, and for the pass header messages.  ("Pass
  	1: xxxxx")
  util.c (print_resource_track): Now takes a description argument.
  super.c, unix.c, e2fsck.c: New files to separate out the
  	operating-specific operations out from e2fsck.c.  e2fsck.c now
  	contains the global e2fsck context management routines, and
  	super.c contains the "pass 0" initial validation of the
  	superblock and global block group descriptors.
  pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
  	(nearly) all global variables and moved them to the e2fsck
  	context structure.
  problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
  	PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
  	PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
  Updated tests to align with e2fsck problem.c changes.

28 files changed, 298 insertions, 154 deletions

diff --git a/tests/f_badbblocks/expect.1 b/tests/f_badbblocks/expect.1
index 208543fa..d64e745f 100644
--- a/tests/f_badbblocks/expect.1
+++ b/tests/f_badbblocks/expect.1
@@ -13,11 +13,15 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  +50
+Fix? yes
+
+Free blocks count wrong for group #0 (78, counted=77).
+Fix? yes
+
+Free blocks count wrong (78, counted=77).
+Fix? yes
 
-Block bitmap differences: +50.  FIXED
-Free blocks count wrong for group 0 (78, counted=77).  FIXED
-Free blocks count wrong (78, counted=77).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 11/32 files (0.0% non-contiguous), 23/100 blocks
diff --git a/tests/f_baddir/expect.1 b/tests/f_baddir/expect.1
index f8f02558..375a2bf9 100644
--- a/tests/f_baddir/expect.1
+++ b/tests/f_baddir/expect.1
@@ -36,12 +36,18 @@ Pass 4: Checking reference counts
 Inode 12 ref count is 1, should be 2.  Fix? yes
 
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  -22
+Fix? yes
+
+Free blocks count wrong (74, counted=75).
+Fix? yes
+
+Inode bitmap differences:  -13
+Fix? yes
+
+Directories count wrong for group #0 (5, counted=4).
+Fix? yes
 
-Block bitmap differences: -22.  FIXED
-Free blocks count wrong (74, counted=75).  FIXED
-Inode bitmap differences: -13.  FIXED
-Directories count wrong for group #0 (5, counted=4).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 14/32 files (0.0% non-contiguous), 25/100 blocks
diff --git a/tests/f_baddotdir/expect.1 b/tests/f_baddotdir/expect.1
index 77b8f8cf..e24aa94f 100644
--- a/tests/f_baddotdir/expect.1
+++ b/tests/f_baddotdir/expect.1
@@ -47,10 +47,12 @@ Fix? yes
 
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (70, counted=71).
+Fix? yes
+
+Free blocks count wrong (70, counted=71).
+Fix? yes
 
-Free blocks count wrong for group 0 (70, counted=71).  FIXED
-Free blocks count wrong (70, counted=71).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 18/32 files (0.0% non-contiguous), 29/100 blocks
diff --git a/tests/f_badinode/expect.1 b/tests/f_badinode/expect.1
index 67120d09..29af17ba 100644
--- a/tests/f_badinode/expect.1
+++ b/tests/f_badinode/expect.1
@@ -20,13 +20,21 @@ Clear? yes
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  -25
+Fix? yes
+
+Free blocks count wrong for group #0 (76, counted=77).
+Fix? yes
+
+Free blocks count wrong (76, counted=77).
+Fix? yes
+
+Free inodes count wrong for group #0 (17, counted=20).
+Fix? yes
+
+Free inodes count wrong (17, counted=20).
+Fix? yes
 
-Block bitmap differences: -25.  FIXED
-Free blocks count wrong for group 0 (76, counted=77).  FIXED
-Free blocks count wrong (76, counted=77).  FIXED
-Free inodes count wrong for group #0 (17, counted=20).  FIXED
-Free inodes count wrong (17, counted=20).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 12/32 files (0.0% non-contiguous), 23/100 blocks
diff --git a/tests/f_badprimary/expect.1 b/tests/f_badprimary/expect.1
index bca07d2b..eb498ff5 100644
--- a/tests/f_badprimary/expect.1
+++ b/tests/f_badprimary/expect.1
@@ -4,18 +4,20 @@ Pass 1: Checking inodes, blocks, and sizes
 The primary superblock (1) is on the bad block list.
 
 If the block is really bad, the filesystem can not be fixed.
-You can clear the this block from the bad block list
-and hope that block is really OK, but there are no guarantees.
+You can clear the this block (and hope for the best) from the
+bad block list and hope that block is really OK, but there are no
+guarantees.
 
-Clear (and hope for the best)? yes
+Clear? yes
 
 Block 2 in the primary group descriptors is on the bad block list
 
 If the block is really bad, the filesystem can not be fixed.
-You can clear the this block from the bad block list
-and hope that block is really OK, but there are no guarantees.
+You can clear the this block (and hope for the best) from the
+bad block list and hope that block is really OK, but there are no
+guarantees.
 
-Clear (and hope for the best)? yes
+Clear? yes
 
 Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
diff --git a/tests/f_badroot/expect.1 b/tests/f_badroot/expect.1
index cd73a334..187c49a4 100644
--- a/tests/f_badroot/expect.1
+++ b/tests/f_badroot/expect.1
@@ -23,13 +23,21 @@ Connect to /lost+found? yes
 Inode 12 ref count is 2, should be 1.  Fix? yes
 
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (77, counted=76).
+Fix? yes
+
+Free blocks count wrong (77, counted=76).
+Fix? yes
+
+Free inodes count wrong for group #0 (20, counted=19).
+Fix? yes
+
+Directories count wrong for group #0 (2, counted=3).
+Fix? yes
+
+Free inodes count wrong (20, counted=19).
+Fix? yes
 
-Free blocks count wrong for group 0 (77, counted=76).  FIXED
-Free blocks count wrong (77, counted=76).  FIXED
-Free inodes count wrong for group #0 (20, counted=19).  FIXED
-Directories count wrong for group #0 (2, counted=3).  FIXED
-Free inodes count wrong (20, counted=19).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 13/32 files (0.0% non-contiguous), 24/100 blocks
diff --git a/tests/f_badtable/expect.1 b/tests/f_badtable/expect.1
index 11bbc970..5cb96176 100644
--- a/tests/f_badtable/expect.1
+++ b/tests/f_badtable/expect.1
@@ -16,15 +16,27 @@ Pass 4: Checking reference counts
 Inode 2 ref count is 3, should be 2.  Fix? yes
 
 Pass 5: Checking group summary information
-Fix summary information? yes
-
-Block bitmap differences: -11 -12 -13 -14 -15 -16 -17 -18 -19 -20.  FIXED
-Free blocks count wrong for group 0 (78, counted=88).  FIXED
-Free blocks count wrong (78, counted=88).  FIXED
-Inode bitmap differences: +12 +13 +14 +15 +16 +25 +26 +27 +28 +29 +30 +31 +32.  FIXED
-Free inodes count wrong for group #0 (21, counted=8).  FIXED
-Directories count wrong for group #0 (2, counted=1).  FIXED
-Free inodes count wrong (21, counted=8).  FIXED
+Block bitmap differences:  -11 -12 -13 -14 -15 -16 -17 -18 -19 -20
+Fix? yes
+
+Free blocks count wrong for group #0 (78, counted=88).
+Fix? yes
+
+Free blocks count wrong (78, counted=88).
+Fix? yes
+
+Inode bitmap differences:  +12 +13 +14 +15 +16 +25 +26 +27 +28 +29 +30 +31 +32
+Fix? yes
+
+Free inodes count wrong for group #0 (21, counted=8).
+Fix? yes
+
+Directories count wrong for group #0 (2, counted=1).
+Fix? yes
+
+Free inodes count wrong (21, counted=8).
+Fix? yes
+
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 24/32 files (0.0% non-contiguous), 12/100 blocks
diff --git a/tests/f_bbfile/expect.1 b/tests/f_bbfile/expect.1
index 8dcbc4f5..6ffed264 100644
--- a/tests/f_bbfile/expect.1
+++ b/tests/f_bbfile/expect.1
@@ -18,28 +18,29 @@ File /termcap (inode #12, mod time Sun Jan  2 08:29:13 1994)
 	<The bad blocks inode> (inode #1, mod time Sun Jul 17 00:47:58 1994)
 Clone duplicate/bad blocks? yes
 
-
 File /lost+found (inode #11, mod time Sun Jan  2 08:28:40 1994) 
   has 12 duplicate block(s), shared with 1 file(s):
 	<The bad blocks inode> (inode #1, mod time Sun Jul 17 00:47:58 1994)
 Clone duplicate/bad blocks? yes
 
-
 File / (inode #2, mod time Sun Jan  2 08:29:13 1994) 
   has 1 duplicate block(s), shared with 1 file(s):
 	<The bad blocks inode> (inode #1, mod time Sun Jul 17 00:47:58 1994)
 Clone duplicate/bad blocks? yes
 
-
 Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  +43
+Fix? yes
+
+Free blocks count wrong for group #0 (57, counted=41).
+Fix? yes
+
+Free blocks count wrong (57, counted=41).
+Fix? yes
 
-Block bitmap differences: +43.  FIXED
-Free blocks count wrong for group 0 (57, counted=41).  FIXED
-Free blocks count wrong (57, counted=41).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 12/32 files (0.0% non-contiguous), 59/100 blocks
diff --git a/tests/f_bbinode/expect.1 b/tests/f_bbinode/expect.1
index 91de7461..0a3ab107 100644
--- a/tests/f_bbinode/expect.1
+++ b/tests/f_bbinode/expect.1
@@ -27,14 +27,24 @@ Clear? yes
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
-
-Block bitmap differences: -83.  FIXED
-Free blocks count wrong for group 0 (1962, counted=1965).  FIXED
-Free blocks count wrong (1962, counted=1965).  FIXED
-Inode bitmap differences: +41 +42 +43 +44 +45 +46 +47 +48.  FIXED
-Free inodes count wrong for group #0 (485, counted=477).  FIXED
-Free inodes count wrong (485, counted=477).  FIXED
+Block bitmap differences:  -83
+Fix? yes
+
+Free blocks count wrong for group #0 (1962, counted=1965).
+Fix? yes
+
+Free blocks count wrong (1962, counted=1965).
+Fix? yes
+
+Inode bitmap differences:  +41 +42 +43 +44 +45 +46 +47 +48
+Fix? yes
+
+Free inodes count wrong for group #0 (485, counted=477).
+Fix? yes
+
+Free inodes count wrong (485, counted=477).
+Fix? yes
+
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 35/512 files (0.0% non-contiguous), 83/2048 blocks
diff --git a/tests/f_bitmaps/expect.1 b/tests/f_bitmaps/expect.1
index 9b15ea2b..715984d4 100644
--- a/tests/f_bitmaps/expect.1
+++ b/tests/f_bitmaps/expect.1
@@ -5,10 +5,12 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  +12 -20 +41 -50
+Fix? yes
+
+Inode bitmap differences:  +11 -15
+Fix? yes
 
-Block bitmap differences: +12 -20 +41 -50.  FIXED
-Inode bitmap differences: +11 -15.  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 11/32 files (9.1% non-contiguous), 22/100 blocks
diff --git a/tests/f_dup/expect.1 b/tests/f_dup/expect.1
index 082c5454..8375b4ed 100644
--- a/tests/f_dup/expect.1
+++ b/tests/f_dup/expect.1
@@ -14,7 +14,6 @@ File /motd (inode #13, mod time Tue Sep 21 03:19:20 1993)
 	/termcap (inode #12, mod time Tue Sep 21 03:19:14 1993)
 Clone duplicate/bad blocks? yes
 
-
 File /termcap (inode #12, mod time Tue Sep 21 03:19:14 1993) 
   has 2 duplicate block(s), shared with 1 file(s):
 	/motd (inode #13, mod time Tue Sep 21 03:19:20 1993)
@@ -24,10 +23,12 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (44, counted=60).
+Fix? yes
+
+Free blocks count wrong (62, counted=60).
+Fix? yes
 
-Free blocks count wrong for group 0 (44, counted=60).  FIXED
-Free blocks count wrong (62, counted=60).  FIXED
 Padding at end of block bitmap is not set. Fix? yes
 
 
diff --git a/tests/f_dup2/expect.1 b/tests/f_dup2/expect.1
index f9962952..ff5d30ac 100644
--- a/tests/f_dup2/expect.1
+++ b/tests/f_dup2/expect.1
@@ -15,14 +15,12 @@ File /pass1.c (inode #14, mod time Tue Sep 21 04:28:37 1993)
 	/motd (inode #13, mod time Tue Sep 21 03:19:20 1993)
 Clone duplicate/bad blocks? yes
 
-
 File /motd (inode #13, mod time Tue Sep 21 03:19:20 1993) 
   has 4 duplicate block(s), shared with 2 file(s):
 	/pass1.c (inode #14, mod time Tue Sep 21 04:28:37 1993)
 	/termcap (inode #12, mod time Tue Sep 21 03:19:14 1993)
 Clone duplicate/bad blocks? yes
 
-
 File /termcap (inode #12, mod time Tue Sep 21 03:19:14 1993) 
   has 2 duplicate block(s), shared with 1 file(s):
 	/motd (inode #13, mod time Tue Sep 21 03:19:20 1993)
@@ -32,10 +30,12 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (8, counted=22).
+Fix? yes
+
+Free blocks count wrong (26, counted=22).
+Fix? yes
 
-Free blocks count wrong for group 0 (8, counted=22).  FIXED
-Free blocks count wrong (26, counted=22).  FIXED
 Padding at end of block bitmap is not set. Fix? yes
 
 
diff --git a/tests/f_dupfsblks/expect.1 b/tests/f_dupfsblks/expect.1
index 1adda3b3..1249f395 100644
--- a/tests/f_dupfsblks/expect.1
+++ b/tests/f_dupfsblks/expect.1
@@ -13,7 +13,6 @@ File /foo (inode #12, mod time Thu Apr 28 17:57:53 1994)
 	<filesystem metadata>
 Clone duplicate/bad blocks? yes
 
-
 Pass 2: Checking directory structure
 Directory inode 12, block 1, offset 0: directory corrupted
 Salvage? yes
@@ -27,10 +26,12 @@ Salvage? yes
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (77, counted=74).
+Fix? yes
+
+Free blocks count wrong (77, counted=74).
+Fix? yes
 
-Free blocks count wrong for group 0 (77, counted=74).  FIXED
-Free blocks count wrong (77, counted=74).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 12/32 files (8.3% non-contiguous), 26/100 blocks
diff --git a/tests/f_dupsuper/expect.1 b/tests/f_dupsuper/expect.1
index 61603bff..6fff1c05 100644
--- a/tests/f_dupsuper/expect.1
+++ b/tests/f_dupsuper/expect.1
@@ -13,14 +13,13 @@ File /termcap (inode #12, mod time Sun Jan  2 08:29:13 1994)
 	<filesystem metadata>
 Clone duplicate/bad blocks? yes
 
-
 Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  -29 -30 -31
+Fix? yes
 
-Block bitmap differences: -29 -30 -31.  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 12/32 files (8.3% non-contiguous), 39/100 blocks
diff --git a/tests/f_end-bitmap/expect.1 b/tests/f_end-bitmap/expect.1
index f2beea62..87e2fd64 100644
--- a/tests/f_end-bitmap/expect.1
+++ b/tests/f_end-bitmap/expect.1
@@ -5,9 +5,9 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (44, counted=63).
+Fix? yes
 
-Free blocks count wrong for group 0 (44, counted=63).  FIXED
 Padding at end of block bitmap is not set. Fix? yes
 
 
diff --git a/tests/f_expand/expect.1 b/tests/f_expand/expect.1
index 86aba903..e8fffdb3 100644
--- a/tests/f_expand/expect.1
+++ b/tests/f_expand/expect.1
@@ -518,13 +518,21 @@ Connect to /lost+found? yes
 Inode 111 ref count is 2, should be 1.  Fix? yes
 
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (56, counted=55).
+Fix? yes
+
+Free blocks count wrong (56, counted=55).
+Fix? yes
+
+Free inodes count wrong for group #0 (89, counted=88).
+Fix? yes
+
+Directories count wrong for group #0 (2, counted=3).
+Fix? yes
+
+Free inodes count wrong (89, counted=88).
+Fix? yes
 
-Free blocks count wrong for group 0 (56, counted=55).  FIXED
-Free blocks count wrong (56, counted=55).  FIXED
-Free inodes count wrong for group #0 (89, counted=88).  FIXED
-Directories count wrong for group #0 (2, counted=3).  FIXED
-Free inodes count wrong (89, counted=88).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 112/200 files (0.0% non-contiguous), 145/200 blocks
diff --git a/tests/f_illbbitmap/expect.1 b/tests/f_illbbitmap/expect.1
index d22dbf2a..0d20dec6 100644
--- a/tests/f_illbbitmap/expect.1
+++ b/tests/f_illbbitmap/expect.1
@@ -16,11 +16,11 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21
+Fix? yes
 
-Block bitmap differences: +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21.  FIXED
-Inode bitmap differences: -12 -13 -14 -15 -16 -17 -18 -19 -20 -21.  FIXED
-Padding at end of block bitmap is not set. Fix? yes
+Inode bitmap differences:  -12 -13 -14 -15 -16 -17 -18 -19 -20 -21
+Fix? yes
 
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
diff --git a/tests/f_illibitmap/expect.1 b/tests/f_illibitmap/expect.1
index 4e4d996c..b2ffc360 100644
--- a/tests/f_illibitmap/expect.1
+++ b/tests/f_illibitmap/expect.1
@@ -16,9 +16,9 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Inode bitmap differences:  +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11
+Fix? yes
 
-Inode bitmap differences: +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11.  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 11/32 files (0.0% non-contiguous), 22/100 blocks
diff --git a/tests/f_illitable/expect.1 b/tests/f_illitable/expect.1
index e0af316e..aef002c4 100644
--- a/tests/f_illitable/expect.1
+++ b/tests/f_illitable/expect.1
@@ -23,15 +23,27 @@ Root inode not allocated.  Allocate? yes
 
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
-
-Block bitmap differences: -10 -11 -12 -13 -14 -15 -16 -17 -18 -19 -20 -21.  FIXED
-Free blocks count wrong for group 0 (78, counted=90).  FIXED
-Free blocks count wrong (78, counted=90).  FIXED
-Inode bitmap differences: -11.  FIXED
-Free inodes count wrong for group #0 (21, counted=22).  FIXED
-Directories count wrong for group #0 (2, counted=1).  FIXED
-Free inodes count wrong (21, counted=22).  FIXED
+Block bitmap differences:  -10 -11 -12 -13 -14 -15 -16 -17 -18 -19 -20 -21
+Fix? yes
+
+Free blocks count wrong for group #0 (78, counted=90).
+Fix? yes
+
+Free blocks count wrong (78, counted=90).
+Fix? yes
+
+Inode bitmap differences:  -11
+Fix? yes
+
+Free inodes count wrong for group #0 (21, counted=22).
+Fix? yes
+
+Directories count wrong for group #0 (2, counted=1).
+Fix? yes
+
+Free inodes count wrong (21, counted=22).
+Fix? yes
+
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 10/32 files (0.0% non-contiguous), 10/100 blocks
diff --git a/tests/f_lotsbad/expect.1 b/tests/f_lotsbad/expect.1
index fd491d50..8a0f06a3 100644
--- a/tests/f_lotsbad/expect.1
+++ b/tests/f_lotsbad/expect.1
@@ -25,14 +25,24 @@ Entry 'termcap' in / (2) has deleted/unused inode 12.  Clear? yes
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
-
-Block bitmap differences: -27 -28 -29 -30 -31 -32 -33 -34 -35 -36 -37 -38 -39 -40 -41 -44 -45.  FIXED
-Free blocks count wrong for group 0 (41, counted=58).  FIXED
-Free blocks count wrong (41, counted=58).  FIXED
-Inode bitmap differences: -12.  FIXED
-Free inodes count wrong for group #0 (20, counted=21).  FIXED
-Free inodes count wrong (20, counted=21).  FIXED
+Block bitmap differences:  -27 -28 -29 -30 -31 -32 -33 -34 -35 -36 -37 -38 -39 -40 -41 -44 -45
+Fix? yes
+
+Free blocks count wrong for group #0 (41, counted=58).
+Fix? yes
+
+Free blocks count wrong (41, counted=58).
+Fix? yes
+
+Inode bitmap differences:  -12
+Fix? yes
+
+Free inodes count wrong for group #0 (20, counted=21).
+Fix? yes
+
+Free inodes count wrong (20, counted=21).
+Fix? yes
+
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 11/32 files (0.0% non-contiguous), 42/100 blocks
diff --git a/tests/f_lpf/expect.1 b/tests/f_lpf/expect.1
index 3803029a..83261fcd 100644
--- a/tests/f_lpf/expect.1
+++ b/tests/f_lpf/expect.1
@@ -24,16 +24,26 @@ Connect to /lost+found? yes
 Inode 15 ref count is 2, should be 1.  Fix? yes
 
 Pass 5: Checking group summary information
-Fix summary information? yes
-
-Block bitmap differences: +22 +23 +49 +57 +58.  FIXED
-Free blocks count wrong for group 0 (25, counted=33).  FIXED
-Free blocks count wrong (39, counted=33).  FIXED
-Inode bitmap differences: +13.  FIXED
-Free inodes count wrong for group #0 (2, counted=0).  FIXED
-Directories count wrong for group #0 (1, counted=2).  FIXED
-Free inodes count wrong (2, counted=0).  FIXED
-Padding at end of block bitmap is not set. Fix? yes
+Block bitmap differences:  +22 +23 +49 +57 +58
+Fix? yes
+
+Free blocks count wrong for group #0 (25, counted=33).
+Fix? yes
+
+Free blocks count wrong (39, counted=33).
+Fix? yes
+
+Inode bitmap differences:  +13
+Fix? yes
+
+Free inodes count wrong for group #0 (2, counted=0).
+Fix? yes
+
+Directories count wrong for group #0 (1, counted=2).
+Fix? yes
+
+Free inodes count wrong (2, counted=0).
+Fix? yes
 
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
diff --git a/tests/f_messy_inode/expect.1 b/tests/f_messy_inode/expect.1
index 32b2a15c..ae5f52ac 100644
--- a/tests/f_messy_inode/expect.1
+++ b/tests/f_messy_inode/expect.1
@@ -24,11 +24,15 @@ Clear? yes
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Block bitmap differences:  -43 -44 -45 -46 -47 -48 -49
+Fix? yes
+
+Free blocks count wrong for group #0 (68, counted=75).
+Fix? yes
+
+Free blocks count wrong (68, counted=75).
+Fix? yes
 
-Block bitmap differences: -43 -44 -45 -46 -47 -48 -49.  FIXED
-Free blocks count wrong for group 0 (68, counted=75).  FIXED
-Free blocks count wrong (68, counted=75).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 29/32 files (3.4% non-contiguous), 25/100 blocks
diff --git a/tests/f_misstable/expect.1 b/tests/f_misstable/expect.1
index 83514548..5e774613 100644
--- a/tests/f_misstable/expect.1
+++ b/tests/f_misstable/expect.1
@@ -21,15 +21,27 @@ Pass 4: Checking reference counts
 Inode 2 ref count is 8, should be 4.  Fix? yes
 
 Pass 5: Checking group summary information
-Fix summary information? yes
-
-Block bitmap differences: -8385 -8386 -8387 -8388 -8389 -8390 -8391 -8392 -8393 -8394 -8395 -8396 -8397 -8398 -8399 -8400 -8401 -8402 -8403 -8404 -8405.  FIXED
-Free blocks count wrong for group 0 (7987, counted=7984).  FIXED
-Free blocks count wrong (11602, counted=11599).  FIXED
-Inode bitmap differences: -1505 -1506 -1507 -1508 -1509 -1510 -1511 -1512 -1513 -1514 -1515 -1516.  FIXED
-Free inodes count wrong for group #0 (1493, counted=1489).  FIXED
-Directories count wrong for group #0 (2, counted=3).  FIXED
-Free inodes count wrong (2997, counted=2993).  FIXED
+Block bitmap differences:  -8385 -8386 -8387 -8388 -8389 -8390 -8391 -8392 -8393 -8394 -8395 -8396 -8397 -8398 -8399 -8400 -8401 -8402 -8403 -8404 -8405
+Fix? yes
+
+Free blocks count wrong for group #0 (7987, counted=7984).
+Fix? yes
+
+Free blocks count wrong (11602, counted=11599).
+Fix? yes
+
+Inode bitmap differences:  -1505 -1506 -1507 -1508 -1509 -1510 -1511 -1512 -1513 -1514 -1515 -1516
+Fix? yes
+
+Free inodes count wrong for group #0 (1493, counted=1489).
+Fix? yes
+
+Directories count wrong for group #0 (2, counted=3).
+Fix? yes
+
+Free inodes count wrong (2997, counted=2993).
+Fix? yes
+
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 15/3008 files (0.0% non-contiguous), 401/12000 blocks
diff --git a/tests/f_noroot/expect.1 b/tests/f_noroot/expect.1
index cef02279..cc90d93a 100644
--- a/tests/f_noroot/expect.1
+++ b/tests/f_noroot/expect.1
@@ -27,13 +27,21 @@ Inode 12 ref count is 4, should be 3.  Fix? yes
 Unattached zero-length inode 15.  Clear? yes
 
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (75, counted=74).
+Fix? yes
+
+Free blocks count wrong (75, counted=74).
+Fix? yes
+
+Free inodes count wrong for group #0 (17, counted=16).
+Fix? yes
+
+Directories count wrong for group #0 (4, counted=5).
+Fix? yes
+
+Free inodes count wrong (17, counted=16).
+Fix? yes
 
-Free blocks count wrong for group 0 (75, counted=74).  FIXED
-Free blocks count wrong (75, counted=74).  FIXED
-Free inodes count wrong for group #0 (17, counted=16).  FIXED
-Directories count wrong for group #0 (4, counted=5).  FIXED
-Free inodes count wrong (17, counted=16).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 16/32 files (0.0% non-contiguous), 26/100 blocks
diff --git a/tests/f_overfsblks/expect.1 b/tests/f_overfsblks/expect.1
index d0f47ebd..a38b9142 100644
--- a/tests/f_overfsblks/expect.1
+++ b/tests/f_overfsblks/expect.1
@@ -9,9 +9,9 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Inode bitmap differences:  -12 -13 -14 -15 -16 -17 -18 -19 -20 -21
+Fix? yes
 
-Inode bitmap differences: -12 -13 -14 -15 -16 -17 -18 -19 -20 -21.  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 11/32 files (0.0% non-contiguous), 22/100 blocks
diff --git a/tests/f_preen/expect.2 b/tests/f_preen/expect.2
index 9d30709d..a7f6ce10 100644
--- a/tests/f_preen/expect.2
+++ b/tests/f_preen/expect.2
@@ -3,15 +3,27 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
-
-Free blocks count wrong for group 0 (8042, counted=7614).  FIXED
-Free blocks count wrong for group 1 (170, counted=169).  FIXED
-Free blocks count wrong (8212, counted=7783).  FIXED
-Free inodes count wrong for group #0 (1053, counted=1052).  FIXED
-Free inodes count wrong for group #1 (1064, counted=1063).  FIXED
-Directories count wrong for group #1 (0, counted=1).  FIXED
-Free inodes count wrong (2117, counted=2115).  FIXED
+Free blocks count wrong for group #0 (8042, counted=7614).
+Fix? yes
+
+Free blocks count wrong for group #1 (170, counted=169).
+Fix? yes
+
+Free blocks count wrong (8212, counted=7783).
+Fix? yes
+
+Free inodes count wrong for group #0 (1053, counted=1052).
+Fix? yes
+
+Free inodes count wrong for group #1 (1064, counted=1063).
+Fix? yes
+
+Directories count wrong for group #1 (0, counted=1).
+Fix? yes
+
+Free inodes count wrong (2117, counted=2115).
+Fix? yes
+
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 13/2128 files (0.0% non-contiguous), 717/8500 blocks
diff --git a/tests/f_zero_group/expect.1 b/tests/f_zero_group/expect.1
index c066e8c4..20796198 100644
--- a/tests/f_zero_group/expect.1
+++ b/tests/f_zero_group/expect.1
@@ -4,12 +4,18 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (7987, counted=7982).
+Fix? yes
+
+Free blocks count wrong (11602, counted=11597).
+Fix? yes
+
+Free inodes count wrong for group #0 (1493, counted=1488).
+Fix? yes
+
+Free inodes count wrong (2997, counted=2992).
+Fix? yes
 
-Free blocks count wrong for group 0 (7987, counted=7982).  FIXED
-Free blocks count wrong (11602, counted=11597).  FIXED
-Free inodes count wrong for group #0 (1493, counted=1488).  FIXED
-Free inodes count wrong (2997, counted=2992).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 16/3008 files (0.0% non-contiguous), 403/12000 blocks
diff --git a/tests/f_zero_super/expect.1 b/tests/f_zero_super/expect.1
index ff9e1b3b..a7a6b480 100644
--- a/tests/f_zero_super/expect.1
+++ b/tests/f_zero_super/expect.1
@@ -4,12 +4,18 @@ Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
 Pass 4: Checking reference counts
 Pass 5: Checking group summary information
-Fix summary information? yes
+Free blocks count wrong for group #0 (7987, counted=7982).
+Fix? yes
+
+Free blocks count wrong (11602, counted=11597).
+Fix? yes
+
+Free inodes count wrong for group #0 (1493, counted=1488).
+Fix? yes
+
+Free inodes count wrong (2997, counted=2992).
+Fix? yes
 
-Free blocks count wrong for group 0 (7987, counted=7982).  FIXED
-Free blocks count wrong (11602, counted=11597).  FIXED
-Free inodes count wrong for group #0 (1493, counted=1488).  FIXED
-Free inodes count wrong (2997, counted=2992).  FIXED
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 16/3008 files (0.0% non-contiguous), 403/12000 blocks