e2fsck: fix mysterious "FILE SYSTEM WAS MODIFIED" with no changes

Commit 2a77a784a3 (firest released in e2fsprogs 1.33) compared
superblock summary free blocks and inode counts with the allocation
bitmap counts before starting the file system check proper, and if
they differed, set the superblock and marked it as dirty.  If no other
file systme changes were required, this would cause a "*** FILE SYSTEM
WAS MODIFIED ***" message without any explanation of what e2fsck had
changed.

We fix this by only setting the superblock summary free block/inodes
counts if we are skipping a full check, and in non-preen mode, e2fsck
will now print an explicit message stating how the superblock had been
updated.

In a full check, any updates to the superblock free blocks/inodes
fields will be noted in pass5.

This change requires changing a few test results (essentially
reversing the changes made in commit 2a77a784a3).

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

7 files changed, 6 insertions, 15 deletions

diff --git a/tests/f_baddir/expect.1 b/tests/f_baddir/expect.1
index 39735061..cf46a60c 100644
--- a/tests/f_baddir/expect.1
+++ b/tests/f_baddir/expect.1
@@ -39,6 +39,9 @@ Pass 5: Checking group summary information
 Block bitmap differences:  -22
 Fix? yes
 
+Free blocks count wrong (74, counted=75).
+Fix? yes
+
 Inode bitmap differences:  -13
 Fix? yes
 
diff --git a/tests/f_dup/expect.1 b/tests/f_dup/expect.1
index ce369062..e7128f34 100644
--- a/tests/f_dup/expect.1
+++ b/tests/f_dup/expect.1
@@ -27,7 +27,7 @@ Pass 5: Checking group summary information
 Free blocks count wrong for group #0 (44, counted=60).
 Fix? yes
 
-Free blocks count wrong (44, counted=60).
+Free blocks count wrong (62, counted=60).
 Fix? yes
 
 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 79a5f1a0..0476005d 100644
--- a/tests/f_dup2/expect.1
+++ b/tests/f_dup2/expect.1
@@ -34,7 +34,7 @@ Pass 5: Checking group summary information
 Free blocks count wrong for group #0 (8, counted=22).
 Fix? yes
 
-Free blocks count wrong (8, counted=22).
+Free blocks count wrong (26, counted=22).
 Fix? yes
 
 Padding at end of block bitmap is not set. Fix? yes
diff --git a/tests/f_end-bitmap/expect.1 b/tests/f_end-bitmap/expect.1
index 3348a2b3..87e2fd64 100644
--- a/tests/f_end-bitmap/expect.1
+++ b/tests/f_end-bitmap/expect.1
@@ -8,9 +8,6 @@ Pass 5: Checking group summary information
 Free blocks count wrong for group #0 (44, counted=63).
 Fix? yes
 
-Free blocks count wrong (44, counted=63).
-Fix? yes
-
 Padding at end of block bitmap is not set. Fix? yes
 
 
diff --git a/tests/f_lpf/expect.1 b/tests/f_lpf/expect.1
index 6c0a746c..4f2853c5 100644
--- a/tests/f_lpf/expect.1
+++ b/tests/f_lpf/expect.1
@@ -30,7 +30,7 @@ Fix? yes
 Free blocks count wrong for group #0 (24, counted=33).
 Fix? yes
 
-Free blocks count wrong (24, counted=33).
+Free blocks count wrong (38, counted=33).
 Fix? yes
 
 Inode bitmap differences:  +13
diff --git a/tests/f_summary_counts/expect.1 b/tests/f_summary_counts/expect.1
index 5c528bb4..ddb14bd6 100644
--- a/tests/f_summary_counts/expect.1
+++ b/tests/f_summary_counts/expect.1
@@ -7,18 +7,12 @@ Pass 5: Checking group summary information
 Free blocks count wrong for group #0 (200, counted=80).
 Fix? yes
 
-Free blocks count wrong (200, counted=80).
-Fix? yes
-
 Free inodes count wrong for group #0 (250, counted=5).
 Fix? yes
 
 Directories count wrong for group #0 (150, counted=2).
 Fix? yes
 
-Free inodes count wrong (250, counted=5).
-Fix? yes
-
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 11/16 files (0.0% non-contiguous), 20/100 blocks
diff --git a/tests/f_unused_itable/expect.1 b/tests/f_unused_itable/expect.1
index d77e82a5..08a97001 100644
--- a/tests/f_unused_itable/expect.1
+++ b/tests/f_unused_itable/expect.1
@@ -22,9 +22,6 @@ Fix? yes
 Free inodes count wrong for group #1 (64, counted=58).
 Fix? yes
 
-Free inodes count wrong (117, counted=109).
-Fix? yes
-
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 19/128 files (0.0% non-contiguous), 165/1000 blocks