From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: "Theodore Ts'o" <tytso@mit.edu>
Cc: linux-ext4@vger.kernel.org
Subject: Re: [PATCH 14/54] e2fsck: fix the journal recreation message
Date: Tue, 27 Jan 2015 11:37:00 -0800 [thread overview]
Message-ID: <20150127193700.GB21455@birch.djwong.org> (raw)
In-Reply-To: <20150127180254.GN2453@thunk.org>
On Tue, Jan 27, 2015 at 01:02:54PM -0500, Theodore Ts'o wrote:
> On Mon, Jan 26, 2015 at 11:37:03PM -0800, Darrick J. Wong wrote:
> > When we recreate the journal, don't say that the FS "is now ext3
> > again", since we could be fixing a damaged ext4 FS journal, which does
> > not magically convert the FS back to ext3.
> >
> > Fix the po files too, though this string hasn't been translated.
> >
>
> So a couple of things. "Journaled" is spelled with a single 'l':
>
> http://www.oxforddictionaries.com/definition/english/journal
>
> Also, if you're going to fix the journal recreation message, we should
> also fix the message which is generated when the journal is removed.
>
> Finally, don't mess with the po files; just before we do a release,
> we'll regenerate the po template file (e2fsprogs.pot), and there are
> automated tools that will take care of merging the changes into the
> .po files. It's cleaner if we don't modify the po files except via
> automated tools, when we get updates from the Translation Project:
>
> http://translationproject.org/html/maintainers.html
>
> Here's the patch that I've applied instead. I ended up simplifying
> the message because "journal has been re-created - filesystem is
> journaled again" sounds a like an entry from
>
> http://tvtropes.org/pmwiki/pmwiki.php/Main/DepartmentOfRedundancyDepartment
>
> :-)
All good points; thank you for making the corrections.
I'll find a place (SUBMITTING-PATCHES?) for leaving a note to leave the po
files alone, since I wasn't aware of the translation automation.
--D
>
> - Ted
>
>
> commit 85068f9d86ab70da6d27384210f1c964f8c09f79
> Author: Darrick J. Wong <darrick.wong@oracle.com>
> Date: Mon Jan 26 23:37:03 2015 -0800
>
> e2fsck: fix message when the journal is deleted and regenerated
>
> When we recreate the journal, don't say that the FS "is now ext3
> again", since we could be fixing a damaged ext4 FS journal, which does
> not magically convert the FS back to ext3.
>
> [ Use "journaled" instead of "journalled", and also fix the message we
> print when deleting the journal --Ted ]
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
>
> diff --git a/e2fsck/journal.c b/e2fsck/journal.c
> index 6119cda..9f32095 100644
> --- a/e2fsck/journal.c
> +++ b/e2fsck/journal.c
> @@ -545,8 +545,7 @@ static errcode_t e2fsck_journal_fix_bad_inode(e2fsck_t ctx,
> pctx->ino = sb->s_journal_inum;
> if (fix_problem(ctx, PR_0_JOURNAL_BAD_INODE, pctx)) {
> if (has_journal && sb->s_journal_inum)
> - printf("*** ext3 journal has been deleted - "
> - "filesystem is now ext2 only ***\n\n");
> + printf("*** journal has been deleted ***\n\n");
> sb->s_feature_compat &= ~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
> sb->s_journal_inum = 0;
> memset(sb->s_jnl_blocks, 0, sizeof(sb->s_jnl_blocks));
> diff --git a/e2fsck/unix.c b/e2fsck/unix.c
> index 615d690..96551a1 100644
> --- a/e2fsck/unix.c
> +++ b/e2fsck/unix.c
> @@ -1674,8 +1674,7 @@ print_unsupp_features:
> }
> log_out(ctx, "%s", _(" Done.\n"));
> log_out(ctx, "%s",
> - _("\n*** journal has been re-created - "
> - "filesystem is now ext3 again ***\n"));
> + _("\n*** journal has been regenerated ***\n"));
> }
> }
> no_journal:
> diff --git a/tests/f_badjour_indblks/expect.1 b/tests/f_badjour_indblks/expect.1
> index 7ccc59b..cb8054c 100644
> --- a/tests/f_badjour_indblks/expect.1
> +++ b/tests/f_badjour_indblks/expect.1
> @@ -1,7 +1,7 @@
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Adding dirhash hint to filesystem.
>
> @@ -25,7 +25,7 @@ Recreate journal? yes
>
> Creating journal (1024 blocks): Done.
>
> -*** journal has been re-created - filesystem is now ext3 again ***
> +*** journal has been regenerated ***
>
> test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
> test_filesys: 11/256 files (0.0% non-contiguous), 1111/8192 blocks
> diff --git a/tests/f_badjourblks/expect.1 b/tests/f_badjourblks/expect.1
> index 34c6658..5483a0d 100644
> --- a/tests/f_badjourblks/expect.1
> +++ b/tests/f_badjourblks/expect.1
> @@ -1,7 +1,7 @@
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Pass 1: Checking inodes, blocks, and sizes
> Journal inode is not in use, but contains data. Clear? yes
> @@ -23,7 +23,7 @@ Recreate journal? yes
>
> Creating journal (1024 blocks): Done.
>
> -*** journal has been re-created - filesystem is now ext3 again ***
> +*** journal has been regenerated ***
>
> test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
> test_filesys: 11/256 files (0.0% non-contiguous), 1079/8192 blocks
> diff --git a/tests/f_jnl_etb_alloc_fail/expect.1 b/tests/f_jnl_etb_alloc_fail/expect.1
> index 8f4ebbb..243a151 100644
> --- a/tests/f_jnl_etb_alloc_fail/expect.1
> +++ b/tests/f_jnl_etb_alloc_fail/expect.1
> @@ -1,7 +1,7 @@
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Superblock has_journal flag is clear, but a journal is present.
> Clear? yes
> diff --git a/tests/f_miss_journal/expect.1 b/tests/f_miss_journal/expect.1
> index 6ec8b38..d435952 100644
> --- a/tests/f_miss_journal/expect.1
> +++ b/tests/f_miss_journal/expect.1
> @@ -1,7 +1,7 @@
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Pass 1: Checking inodes, blocks, and sizes
> Pass 2: Checking directory structure
> @@ -21,7 +21,7 @@ Recreate journal? yes
>
> Creating journal (1024 blocks): Done.
>
> -*** journal has been re-created - filesystem is now ext3 again ***
> +*** journal has been regenerated ***
>
> test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
> test_filesys: 11/256 files (0.0% non-contiguous), 1079/2048 blocks
> diff --git a/tests/j_corrupt_sb_magic/expect b/tests/j_corrupt_sb_magic/expect
> index 2169a15..d1dae88 100644
> --- a/tests/j_corrupt_sb_magic/expect
> +++ b/tests/j_corrupt_sb_magic/expect
> @@ -1,7 +1,7 @@
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Superblock has_journal flag is clear, but a journal is present.
> Clear? yes
> @@ -26,7 +26,7 @@ Recreate journal? yes
>
> Creating journal (1024 blocks): Done.
>
> -*** journal has been re-created - filesystem is now ext3 again ***
> +*** journal has been regenerated ***
>
> test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
> test_filesys: 12/128 files (0.0% non-contiguous), 1092/2048 blocks
> diff --git a/tests/j_long_trans/expect b/tests/j_long_trans/expect
> index 7638ef1..7a17541 100644
> --- a/tests/j_long_trans/expect
> +++ b/tests/j_long_trans/expect
> @@ -57,7 +57,7 @@ test_filesys: recovering journal
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Resize inode not valid. Recreate? yes
>
> @@ -100,7 +100,7 @@ Recreate journal? yes
>
> Creating journal (8192 blocks): Done.
>
> -*** journal has been re-created - filesystem is now ext3 again ***
> +*** journal has been regenerated ***
>
> test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
> test_filesys: 11/16384 files (0.0% non-contiguous), 14420/262144 blocks
> diff --git a/tests/j_long_trans_mcsum_32bit/expect b/tests/j_long_trans_mcsum_32bit/expect
> index 0d141c1..a808d9f 100644
> --- a/tests/j_long_trans_mcsum_32bit/expect
> +++ b/tests/j_long_trans_mcsum_32bit/expect
> @@ -93,7 +93,7 @@ test_filesys: recovering journal
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Resize inode not valid. Recreate? yes
>
> @@ -139,7 +139,7 @@ Recreate journal? yes
>
> Creating journal (16384 blocks): Done.
>
> -*** journal has been re-created - filesystem is now ext3 again ***
> +*** journal has been regenerated ***
>
> test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
> test_filesys: 11/32768 files (0.0% non-contiguous), 27039/524288 blocks
> diff --git a/tests/j_long_trans_mcsum_64bit/expect b/tests/j_long_trans_mcsum_64bit/expect
> index 94e9925..76e109a 100644
> --- a/tests/j_long_trans_mcsum_64bit/expect
> +++ b/tests/j_long_trans_mcsum_64bit/expect
> @@ -92,7 +92,7 @@ test_filesys: recovering journal
> Superblock has an invalid journal (inode 8).
> Clear? yes
>
> -*** ext3 journal has been deleted - filesystem is now ext2 only ***
> +*** journal has been deleted ***
>
> Resize inode not valid. Recreate? yes
>
> @@ -138,7 +138,7 @@ Recreate journal? yes
>
> Creating journal (16384 blocks): Done.
>
> -*** journal has been re-created - filesystem is now ext3 again ***
> +*** journal has been regenerated ***
>
> test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
> test_filesys: 11/32768 files (0.0% non-contiguous), 27057/524288 blocks
next prev parent reply other threads:[~2015-01-27 19:37 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 7:35 [PATCH 00/54] e2fsprogs January 2015 patchbomb Darrick J. Wong
2015-01-27 7:35 ` [PATCH 01/54] misc: fix minor testcase problems Darrick J. Wong
2015-01-27 15:55 ` Theodore Ts'o
2015-01-27 7:35 ` [PATCH 02/54] debugfs: document new commands Darrick J. Wong
2015-01-27 15:56 ` Theodore Ts'o
2015-01-27 7:35 ` [PATCH 03/54] debugfs: fix crash in ea_set argument handling Darrick J. Wong
2015-01-27 15:58 ` Theodore Ts'o
2015-01-27 7:35 ` [PATCH 04/54] libext2fs: initialize i_extra_isize when writing EAs Darrick J. Wong
2015-01-27 16:02 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 05/54] libext2fs: avoid pointless EA block allocation Darrick J. Wong
2015-01-27 16:07 ` Theodore Ts'o
2015-01-27 19:26 ` Darrick J. Wong
2015-01-27 7:36 ` [PATCH 06/54] libext2fs: strengthen i_extra_isize checks when reading/writing xattrs Darrick J. Wong
2015-01-27 16:08 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 07/54] libext2fs: fix tdb.c mmap leak Darrick J. Wong
2015-01-27 16:09 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 08/54] resize2fs: fix regression test to not depend on ext4.ko being loaded Darrick J. Wong
2015-01-27 16:10 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 09/54] tune2fs: disable csum verification before resizing inode Darrick J. Wong
2015-01-27 16:11 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 10/54] tune2fs: abort when trying to enable/disable metadata_csum on mounted fs Darrick J. Wong
2015-01-27 16:26 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 11/54] tune2fs: call out to resize2fs for 64bit conversion Darrick J. Wong
2015-01-27 16:31 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 12/54] e2fsck: clear i_block[] when there are too many bad mappings on a special inode Darrick J. Wong
2015-01-27 16:32 ` Theodore Ts'o
2015-01-27 7:36 ` [PATCH 13/54] e2fsck: on read error, don't rewrite blocks past the end of the fs Darrick J. Wong
2015-01-27 17:35 ` Theodore Ts'o
2015-01-28 23:35 ` Darrick J. Wong
2015-01-27 7:37 ` [PATCH 14/54] e2fsck: fix the journal recreation message Darrick J. Wong
2015-01-27 18:02 ` Theodore Ts'o
2015-01-27 19:37 ` Darrick J. Wong [this message]
2015-01-27 7:37 ` [PATCH 15/54] e2fsck: handle multiple *ind block collisions with critical metadata Darrick J. Wong
2015-01-28 13:52 ` Theodore Ts'o
2015-01-27 7:37 ` [PATCH 16/54] e2fsck: decrement bad count _after_ remapping a duplicate block Darrick J. Wong
2015-01-28 13:58 ` Theodore Ts'o
2015-01-27 7:37 ` [PATCH 17/54] e2fsck: inspect inline dir data as two directory blocks Darrick J. Wong
2015-01-28 15:16 ` Theodore Ts'o
2015-01-27 7:37 ` [PATCH 18/54] e2fsck: improve the inline directory detector Darrick J. Wong
2015-01-28 16:38 ` Theodore Ts'o
2015-01-27 7:37 ` [PATCH 19/54] e2fsck: salvage under-sized dirents by removing them Darrick J. Wong
2015-02-16 15:40 ` Theodore Ts'o
2015-01-27 7:37 ` [PATCH 20/54] e2fsck: add a 'yes to all' response in interactive mode Darrick J. Wong
2015-03-29 2:54 ` Theodore Ts'o
2015-01-27 7:37 ` [PATCH 21/54] libext2fs: zero blocks via FALLOC_FL_ZERO_RANGE in ext2fs_zero_blocks Darrick J. Wong
2015-03-29 3:46 ` Theodore Ts'o
2015-01-27 7:37 ` [PATCH 22/54] libext2fs: ext2fs_new_block2() should call alloc_block hook Darrick J. Wong
2015-03-29 3:08 ` Theodore Ts'o
2015-01-27 7:38 ` [PATCH 23/54] libext2fs: Support readonly filesystem images Darrick J. Wong
2015-03-19 21:32 ` [PATCH v2 " Darrick J. Wong
2015-03-29 3:42 ` Theodore Ts'o
2015-01-27 7:38 ` [PATCH 24/54] libext2fs/e2fsck: provide routines to read-ahead metadata Darrick J. Wong
2015-01-27 7:38 ` [PATCH 25/54] e2fsck: read-ahead metadata during passes 1, 2, and 4 Darrick J. Wong
2015-01-27 7:38 ` [PATCH 26/54] e2fsck: track directories to be rehashed with a bitmap Darrick J. Wong
2015-01-27 7:38 ` [PATCH 27/54] e2fsck: rebuild sparse extent trees/convert non-extent ext3 files Darrick J. Wong
2015-03-19 21:42 ` [PATCH v4 " Darrick J. Wong
2015-01-27 7:38 ` [PATCH 28/54] tests: verify proper rebuilding of sparse extent trees and block map file conversion Darrick J. Wong
2015-01-27 7:38 ` [PATCH 29/54] undo-io: add new calls to and speed up the undo io manager Darrick J. Wong
2015-01-27 7:38 ` [PATCH 30/54] undo-io: be more flexible about setting block size Darrick J. Wong
2015-01-27 7:38 ` [PATCH 31/54] undo-io: use a bitmap to track what we've already written Darrick J. Wong
2015-01-27 7:39 ` [PATCH 32/54] e2undo: fix memory leaks and tweak the error messages somewhat Darrick J. Wong
2015-01-27 7:39 ` [PATCH 33/54] e2undo: ditch tdb file, write everything to a flat file Darrick J. Wong
2015-01-27 7:39 ` [PATCH 34/54] libext2fs: support atexit cleanups Darrick J. Wong
2015-01-27 7:39 ` [PATCH 35/54] e2fsck: optionally create an undo file Darrick J. Wong
2015-01-27 7:39 ` [PATCH 36/54] resize2fs: optionally create " Darrick J. Wong
2015-01-27 7:39 ` [PATCH 37/54] tune2fs: " Darrick J. Wong
2015-01-27 7:39 ` [PATCH 38/54] mke2fs: " Darrick J. Wong
2015-01-27 7:39 ` [PATCH 39/54] debugfs: " Darrick J. Wong
2015-01-27 7:39 ` [PATCH 40/54] tests: test undo file creation in e2fsck/resize2fs/tune2fs/mke2fs Darrick J. Wong
2015-01-27 7:40 ` [PATCH 41/54] tests: test various features of the new e2undo format Darrick J. Wong
2015-01-27 7:40 ` [PATCH 42/54] copy-in: create hardlinks with the correct directory filetype Darrick J. Wong
2015-01-27 7:40 ` [PATCH 43/54] copy-in: for files, only iterate file blocks that are mapped Darrick J. Wong
2015-01-27 7:40 ` [PATCH 44/54] copyin: fix error handling Darrick J. Wong
2015-01-27 7:40 ` [PATCH 45/54] mke2fs: add simple tests and re-alphabetize mke2fs manpage options Darrick J. Wong
2015-01-27 7:40 ` [PATCH 46/54] contrib: script to create minified ext4 image from a directory Darrick J. Wong
2015-01-27 7:40 ` [PATCH 47/54] libext2fs: support allocating uninit blocks in bmap2() Darrick J. Wong
2015-01-27 7:40 ` [PATCH 48/54] libext2fs: find/alloc a range of empty blocks Darrick J. Wong
2015-01-27 7:40 ` [PATCH 49/54] libext2fs: add new hooks to support large allocations Darrick J. Wong
2015-01-27 7:41 ` [PATCH 50/54] libext2fs: implement fallocate Darrick J. Wong
2015-01-27 7:41 ` [PATCH 51/54] libext2fs: use fallocate for creating journals and hugefiles Darrick J. Wong
2015-01-27 7:41 ` [PATCH 52/54] debugfs: implement fallocate Darrick J. Wong
2015-01-27 7:41 ` [PATCH 53/54] tests: test debugfs punch command Darrick J. Wong
2015-03-19 21:44 ` [PATCH 55/54] e2fsck: actually fix inline_data flags problems when user says to do so Darrick J. Wong
2015-03-29 4:05 ` Theodore Ts'o
2015-03-19 21:45 ` [PATCH 56/54] libext2fs: zero hash in ibody extended attributes Darrick J. Wong
2015-03-29 4:13 ` Theodore Ts'o
2015-03-19 21:47 ` [PATCH 57/54] e2fsck: convert block-mapped files to extents on bigalloc fs Darrick J. Wong
2015-03-19 23:54 ` [PATCH 58/54] e2fsck: turn inline data symlink into a fast symlink when possible Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150127193700.GB21455@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).