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

  f_dup3: New test case which checks handling of blocks claimed multiple
  	times by one inode which weren't handled correctly by e2fsck 1.20.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 3e1f672..eaa8310 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,9 @@
 2001-06-01  Theodore Tso  <tytso@valinux.com>
 
+       * f_dup3: New test case which checks handling of blocks claimed
+               multiple times by one inode which weren't handled
+               correctly by e2fsck 1.20.
+
        * d_loaddump: Fix test script to remove bash'isms, and make the
                shell script more robust in cases where the user has
                overridden CFLAGS so that the debugfs binary isn't

diff --git a/tests/f_dup3/expect.1 b/tests/f_dup3/expect.1
new file mode 100644 (file)
index 0000000..88f3008
--- /dev/null
+++ b/tests/f_dup3/expect.1
@@ -0,0 +1,44 @@
+Pass 1: Checking inodes, blocks, and sizes
+Inode 16, i_blocks is 22, should be 24.  Fix? yes
+
+Duplicate blocks found... invoking duplicate block passes.
+Pass 1B: Rescan for duplicate/bad blocks
+Duplicate/bad block(s) in inode 11: 24 24
+Duplicate/bad block(s) in inode 14: 69 69
+Duplicate/bad block(s) in inode 16: 99 99
+Pass 1C: Scan directories for inodes with dup blocks.
+Pass 1D: Reconciling duplicate blocks
+(There are 3 inodes containing duplicate/bad blocks.)
+
+File /e2fsck (inode #16, mod time Tue Sep 21 04:32:22 1993) 
+  has 2 duplicate block(s), shared with 0 file(s):
+Clone duplicate/bad blocks? yes
+
+File /pass1.c (inode #14, mod time Tue Sep 21 04:28:37 1993) 
+  has 2 duplicate block(s), shared with 0 file(s):
+Clone duplicate/bad blocks? yes
+
+File /lost+found (inode #11, mod time Mon Sep 20 03:26:36 1993) 
+  has 2 duplicate block(s), shared with 0 file(s):
+Clone duplicate/bad blocks? yes
+
+Pass 2: Checking directory structure
+Directory inode 11, block 12, offset 0: directory corrupted
+Salvage? yes
+
+Pass 3: Checking directory connectivity
+Pass 4: Checking reference counts
+Pass 5: Checking group summary information
+Block bitmap differences:  -68
+Fix? yes
+
+Free blocks count wrong for group #0 (20, counted=19).
+Fix? yes
+
+Free blocks count wrong (20, counted=19).
+Fix? yes
+
+
+test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
+test_filesys: 16/16 files (25.0% non-contiguous), 81/100 blocks
+Exit status is 1

diff --git a/tests/f_dup3/expect.2 b/tests/f_dup3/expect.2
new file mode 100644 (file)
index 0000000..2a31ae6
--- /dev/null
+++ b/tests/f_dup3/expect.2
@@ -0,0 +1,7 @@
+Pass 1: Checking inodes, blocks, and sizes
+Pass 2: Checking directory structure
+Pass 3: Checking directory connectivity
+Pass 4: Checking reference counts
+Pass 5: Checking group summary information
+test_filesys: 16/16 files (25.0% non-contiguous), 81/100 blocks
+Exit status is 0

diff --git a/tests/f_dup3/image.gz b/tests/f_dup3/image.gz
new file mode 100644 (file)
index 0000000..3712cbc
Binary files /dev/null and b/tests/f_dup3/image.gz differ

diff --git a/tests/f_dup3/name b/tests/f_dup3/name
new file mode 100644 (file)
index 0000000..4f312ad
--- /dev/null
+++ b/tests/f_dup3/name
@@ -0,0 +1 @@
+blocks claimed by one file multiple times