aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2005-07-04 13:08:37 -0500
committerTheodore Ts'o <tytso@mit.edu>2005-07-04 13:08:37 -0500
commit49809dd86379d0c68ee33de0a74dd76e6e6ec133 (patch)
tree02e5d645814d3bfc301ba2fb895d32b9c8f9ef01
parent70f75dd76bde4c45da29d41ed17436685e8262e9 (diff)
downloade2fsprogs-49809dd86379d0c68ee33de0a74dd76e6e6ec133.tar.gz
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.
-rw-r--r--e2fsck/ChangeLog3
-rw-r--r--e2fsck/problem.c2
-rw-r--r--tests/ChangeLog4
-rw-r--r--tests/f_bbfile/expect.12
-rw-r--r--tests/f_dup/expect.12
-rw-r--r--tests/f_dup2/expect.12
-rw-r--r--tests/f_dup3/expect.12
-rw-r--r--tests/f_dup_resize/expect.12
-rw-r--r--tests/f_dupfsblks/expect.12
-rw-r--r--tests/f_dupsuper/expect.12
10 files changed, 15 insertions, 8 deletions
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index d13aec9c..726d63bc 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,5 +1,8 @@
2005-07-04 Theodore Ts'o <tytso@mit.edu>
+ * 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 87c97839..c2e50760 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 f39d7fd5..387e24c7 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,9 @@
2005-07-04 Theodore Ts'o <tytso@mit.edu>
+ * 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 <tytso@mit.edu>
diff --git a/tests/f_bbfile/expect.1 b/tests/f_bbfile/expect.1
index 661ab0fa..1d639f6c 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 65ef5059..ce369062 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 70e67711..79a5f1a0 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 872406bd..13934169 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 92258436..dd8fe05c 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 1e99530c..661e164f 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 513b2922..830370a6 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.)