From: Theodore Ts'o Date: Mon, 4 Jul 2005 18:08:37 +0000 (-0500) Subject: Make e2fsck Pass 1C header consistent with the other headers X-Git-Tag: E2FSPROGS-1.39-WIP-1210~55 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=49809dd86379d0c68ee33de0a74dd76e6e6ec133;p=tools%2Fe2fsprogs.git Make e2fsck Pass 1C header consistent with the other headers Removed the period from the Pass 1C header to make it consistent with the other e2fsck pass headers. --- diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index d13aec9..726d63b 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,5 +1,8 @@ 2005-07-04 Theodore Ts'o + * problem.c: Remove period from the Pass 1C header, to be + consistent with the other Pass headers. + * pass2.c (e2fsck_process_bad_inode): Fixed bug which could cause e2fsck to core dump if a disconnected inode contained an extended attribute. This was actually caused by two bugs. diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 87c9783..c2e5076 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -806,7 +806,7 @@ static const struct e2fsck_problem problem_table[] = { /* Pass 1C: Scan directories for inodes with multiply-claimed blocks. */ { PR_1C_PASS_HEADER, - N_("Pass 1C: Scanning directories for @is with @m @bs.\n"), + N_("Pass 1C: Scanning directories for @is with @m @bs\n"), PROMPT_NONE, 0 }, diff --git a/tests/ChangeLog b/tests/ChangeLog index f39d7fd..387e24c 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,9 @@ 2005-07-04 Theodore Ts'o + * f_bbfile, f_dup, f_dup2, f_dup3, f_dup_resize, f_dupfsblks, + f_dupsuper: Update expect files to remove period from the + Pass 1C header. + * f_bad_disconnected_inode: New test case 2006-06-30 Theodore Ts'o diff --git a/tests/f_bbfile/expect.1 b/tests/f_bbfile/expect.1 index 661ab0f..1d639f6 100644 --- a/tests/f_bbfile/expect.1 +++ b/tests/f_bbfile/expect.1 @@ -10,7 +10,7 @@ Pass 1B: Rescanning for multiply-claimed blocks Multiply-claimed block(s) in inode 2: 21 Multiply-claimed block(s) in inode 11: 9 10 11 12 13 14 15 16 17 18 19 20 Multiply-claimed block(s) in inode 12: 25 26 -Pass 1C: Scanning directories for inodes with multiply-claimed blocks. +Pass 1C: Scanning directories for inodes with multiply-claimed blocks Pass 1D: Reconciling multiply-claimed blocks (There are 3 inodes containing multiply-claimed blocks.) diff --git a/tests/f_dup/expect.1 b/tests/f_dup/expect.1 index 65ef505..ce36906 100644 --- a/tests/f_dup/expect.1 +++ b/tests/f_dup/expect.1 @@ -6,7 +6,7 @@ Running additional passes to resolve blocks claimed by more than one inode... Pass 1B: Rescanning for multiply-claimed blocks Multiply-claimed block(s) in inode 12: 25 26 Multiply-claimed block(s) in inode 13: 25 26 -Pass 1C: Scanning directories for inodes with multiply-claimed blocks. +Pass 1C: Scanning directories for inodes with multiply-claimed blocks Pass 1D: Reconciling multiply-claimed blocks (There are 2 inodes containing multiply-claimed blocks.) diff --git a/tests/f_dup2/expect.1 b/tests/f_dup2/expect.1 index 70e6771..79a5f1a 100644 --- a/tests/f_dup2/expect.1 +++ b/tests/f_dup2/expect.1 @@ -7,7 +7,7 @@ Pass 1B: Rescanning for multiply-claimed blocks Multiply-claimed block(s) in inode 12: 25 26 Multiply-claimed block(s) in inode 13: 25 26 57 58 Multiply-claimed block(s) in inode 14: 57 58 -Pass 1C: Scanning directories for inodes with multiply-claimed blocks. +Pass 1C: Scanning directories for inodes with multiply-claimed blocks Pass 1D: Reconciling multiply-claimed blocks (There are 3 inodes containing multiply-claimed blocks.) diff --git a/tests/f_dup3/expect.1 b/tests/f_dup3/expect.1 index 872406b..1393416 100644 --- a/tests/f_dup3/expect.1 +++ b/tests/f_dup3/expect.1 @@ -7,7 +7,7 @@ Pass 1B: Rescanning for multiply-claimed blocks Multiply-claimed block(s) in inode 11: 24 24 Multiply-claimed block(s) in inode 14: 69 69 Multiply-claimed block(s) in inode 16: 99 99 -Pass 1C: Scanning directories for inodes with multiply-claimed blocks. +Pass 1C: Scanning directories for inodes with multiply-claimed blocks Pass 1D: Reconciling multiply-claimed blocks (There are 3 inodes containing multiply-claimed blocks.) diff --git a/tests/f_dup_resize/expect.1 b/tests/f_dup_resize/expect.1 index 9225843..dd8fe05 100644 --- a/tests/f_dup_resize/expect.1 +++ b/tests/f_dup_resize/expect.1 @@ -6,7 +6,7 @@ Running additional passes to resolve blocks claimed by more than one inode... Pass 1B: Rescanning for multiply-claimed blocks Multiply-claimed block(s) in inode 7: 4 5 6 7 Multiply-claimed block(s) in inode 12: 4 5 6 7 -Pass 1C: Scanning directories for inodes with multiply-claimed blocks. +Pass 1C: Scanning directories for inodes with multiply-claimed blocks Pass 1D: Reconciling multiply-claimed blocks (There are 1 inodes containing multiply-claimed blocks.) diff --git a/tests/f_dupfsblks/expect.1 b/tests/f_dupfsblks/expect.1 index 1e99530..661e164 100644 --- a/tests/f_dupfsblks/expect.1 +++ b/tests/f_dupfsblks/expect.1 @@ -11,7 +11,7 @@ Pass 1B: Rescanning for multiply-claimed blocks Multiply-claimed block(s) in inode 12: 3 4 6 1 Multiply-claimed block(s) in inode 13: 2 3 Multiply-claimed block(s) in inode 14: 2 -Pass 1C: Scanning directories for inodes with multiply-claimed blocks. +Pass 1C: Scanning directories for inodes with multiply-claimed blocks Pass 1D: Reconciling multiply-claimed blocks (There are 3 inodes containing multiply-claimed blocks.) diff --git a/tests/f_dupsuper/expect.1 b/tests/f_dupsuper/expect.1 index 513b292..830370a 100644 --- a/tests/f_dupsuper/expect.1 +++ b/tests/f_dupsuper/expect.1 @@ -5,7 +5,7 @@ Pass 1: Checking inodes, blocks, and sizes Running additional passes to resolve blocks claimed by more than one inode... Pass 1B: Rescanning for multiply-claimed blocks Multiply-claimed block(s) in inode 12: 2 3 1 -Pass 1C: Scanning directories for inodes with multiply-claimed blocks. +Pass 1C: Scanning directories for inodes with multiply-claimed blocks Pass 1D: Reconciling multiply-claimed blocks (There are 1 inodes containing multiply-claimed blocks.)