Cc: [email protected]
Signed-off-by: Jan Kara <[email protected]>
---
fs/ext3/super.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 1c7b0fc..890e72f 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1020,7 +1020,7 @@ static int parse_options (char *options, struct super_block *sb,
set_qf_name:
if (sb_any_quota_enabled(sb)) {
printk(KERN_ERR
- "EXT3-fs: Cannot change journalled "
+ "EXT3-fs: Cannot change journaled "
"quota options when quota turned on.\n");
return 0;
}
@@ -1058,7 +1058,7 @@ set_qf_name:
clear_qf_name:
if (sb_any_quota_enabled(sb)) {
printk(KERN_ERR "EXT3-fs: Cannot change "
- "journalled quota options when "
+ "journaled quota options when "
"quota turned on.\n");
return 0;
}
@@ -1169,14 +1169,14 @@ clear_qf_name:
}
if (!sbi->s_jquota_fmt) {
- printk(KERN_ERR "EXT3-fs: journalled quota format "
+ printk(KERN_ERR "EXT3-fs: journaled quota format "
"not specified.\n");
return 0;
}
} else {
if (sbi->s_jquota_fmt) {
- printk(KERN_ERR "EXT3-fs: journalled quota format "
- "specified with no journalling "
+ printk(KERN_ERR "EXT3-fs: journaled quota format "
+ "specified with no journaling "
"enabled.\n");
return 0;
}
@@ -1370,7 +1370,7 @@ static void ext3_orphan_cleanup (struct super_block * sb,
int ret = ext3_quota_on_mount(sb, i);
if (ret < 0)
printk(KERN_ERR
- "EXT3-fs: Cannot turn on journalled "
+ "EXT3-fs: Cannot turn on journaled "
"quota: error %d\n", ret);
}
}
@@ -2712,7 +2712,7 @@ static int ext3_release_dquot(struct dquot *dquot)
static int ext3_mark_dquot_dirty(struct dquot *dquot)
{
- /* Are we journalling quotas? */
+ /* Are we journaling quotas? */
if (EXT3_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
EXT3_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
dquot_mark_dquot_dirty(dquot);
--
1.5.2.4
Cc: [email protected]
Signed-off-by: Jan Kara <[email protected]>
---
fs/ext4/super.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index f6ab164..49099e4 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1164,7 +1164,7 @@ static int parse_options (char *options, struct super_block *sb,
set_qf_name:
if (sb_any_quota_enabled(sb)) {
printk(KERN_ERR
- "EXT4-fs: Cannot change journalled "
+ "EXT4-fs: Cannot change journaled "
"quota options when quota turned on.\n");
return 0;
}
@@ -1202,7 +1202,7 @@ set_qf_name:
clear_qf_name:
if (sb_any_quota_enabled(sb)) {
printk(KERN_ERR "EXT4-fs: Cannot change "
- "journalled quota options when "
+ "journaled quota options when "
"quota turned on.\n");
return 0;
}
@@ -1248,7 +1248,7 @@ clear_qf_name:
case Opt_jqfmt_vfsold:
case Opt_jqfmt_vfsv0:
printk(KERN_ERR
- "EXT4-fs: journalled quota options not "
+ "EXT4-fs: journaled quota options not "
"supported.\n");
break;
case Opt_noquota:
@@ -1333,14 +1333,14 @@ clear_qf_name:
}
if (!sbi->s_jquota_fmt) {
- printk(KERN_ERR "EXT4-fs: journalled quota format "
+ printk(KERN_ERR "EXT4-fs: journaled quota format "
"not specified.\n");
return 0;
}
} else {
if (sbi->s_jquota_fmt) {
- printk(KERN_ERR "EXT4-fs: journalled quota format "
- "specified with no journalling "
+ printk(KERN_ERR "EXT4-fs: journaled quota format "
+ "specified with no journaling "
"enabled.\n");
return 0;
}
@@ -1581,7 +1581,7 @@ static void ext4_orphan_cleanup (struct super_block * sb,
int ret = ext4_quota_on_mount(sb, i);
if (ret < 0)
printk(KERN_ERR
- "EXT4-fs: Cannot turn on journalled "
+ "EXT4-fs: Cannot turn on journaled "
"quota: error %d\n", ret);
}
}
@@ -3106,7 +3106,7 @@ static int ext4_release_dquot(struct dquot *dquot)
static int ext4_mark_dquot_dirty(struct dquot *dquot)
{
- /* Are we journalling quotas? */
+ /* Are we journaling quotas? */
if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
dquot_mark_dquot_dirty(dquot);
--
1.5.2.4
On Wed, 30 Apr 2008 17:06:15 +0200
Jan Kara <[email protected]> wrote:
> - "EXT3-fs: Cannot change journalled "
> + "EXT3-fs: Cannot change journaled "
hrm, who said?
Dictionary.com recognises neither.
google(journalled) = 520,000
google(journaled) = 652,000
akpm:/usr/src/25> grep journalled fs/ext3/*.c|wc -l
17
akpm:/usr/src/25> grep journaled fs/ext3/*.c|wc -l
6
On Wed, 30 Apr 2008 10:43:30 -0700
Andrew Morton <[email protected]> wrote:
> On Wed, 30 Apr 2008 17:06:15 +0200
> Jan Kara <[email protected]> wrote:
>
> > - "EXT3-fs: Cannot change journalled "
> > + "EXT3-fs: Cannot change journaled "
>
> hrm, who said?
This has come up several times before so I thought it might be time to
finally dig to the bottom of the pile and end it forever.
I put on my library hat and went for a dig: the verb is in fact "to
journalize", which according to the OED means
"enter (notes or information) in a journal"
Journal itself is strictly a noun. Thus in English it would be correct
for a file system to have a journal (from the latin diurnalis if anyone
cares) but it would appear that it is a journalizing file system.
The American dictionaries appear to agree with this viewpoint.
If we regard "journalizing" as incorrect then the natural way to end the
word would be -lled for British English and -led would certainly sound
and feel wrong. Indeed the search for the OED turns journalled into
journal when guessing near words but refuses to consider journaled. Our
existing policy is not to mess with US v UK v AU v CA v .. spelling
and that is probably wise.
A search of the ACM literature finds "journalized", "journalled" and
"journaled" are all in use for this operation.
I would submit the correct patch is to change the words to journalizing
and journalized. That would put Linux in agreement with the dictionary,
avoid US v UK meaning differences and not pose a problem linguistically
as all forms are currently in use.
Alan
On Wed, 2008-04-30 at 21:27 +0100, Alan Cox wrote:
> On Wed, 30 Apr 2008 10:43:30 -0700
> Andrew Morton <[email protected]> wrote:
>
> > On Wed, 30 Apr 2008 17:06:15 +0200
> > Jan Kara <[email protected]> wrote:
> >
> > > - "EXT3-fs: Cannot change journalled "
> > > + "EXT3-fs: Cannot change journaled "
> >
> > hrm, who said?
>
> This has come up several times before so I thought it might be time to
> finally dig to the bottom of the pile and end it forever.
>
> I put on my library hat and went for a dig: the verb is in fact "to
> journalize", which according to the OED means
>
> "enter (notes or information) in a journal"
>
> Journal itself is strictly a noun. Thus in English it would be correct
> for a file system to have a journal (from the latin diurnalis if anyone
> cares) but it would appear that it is a journalizing file system.
>
> The American dictionaries appear to agree with this viewpoint.
>
> If we regard "journalizing" as incorrect then the natural way to end the
> word would be -lled for British English and -led would certainly sound
> and feel wrong. Indeed the search for the OED turns journalled into
> journal when guessing near words but refuses to consider journaled. Our
> existing policy is not to mess with US v UK v AU v CA v .. spelling
> and that is probably wise.
>
> A search of the ACM literature finds "journalized", "journalled" and
> "journaled" are all in use for this operation.
I hate to get into these discussions, but I've used "journaled" a lot,
so I feel I should chime in.
Maybe it's different in the UK, but I've always understood that if the
accent is not on the last syllable, then you do not double the final
vowel: offer, offered. So if we accept the use of "journal" as a verb,
"journaled" would be correct.
Since it's not a real word, I'd be happy not to make a big deal out of
it and accept either, so I think we're in agreement.
> I would submit the correct patch is to change the words to journalizing
> and journalized. That would put Linux in agreement with the dictionary,
> avoid US v UK meaning differences and not pose a problem linguistically
> as all forms are currently in use.
That would probably be more correct, but the use of "journal" as a verb
has really gotten ingrained in file system developers brains. I
personally haven't heard or used "journalized" and it would take some
getting used to.
Shaggy
P.S. Evolution's spell-checker doesn't like "journalize" either, but I
trust that it's correct.
--
David Kleikamp
IBM Linux Technology Center
> > A search of the ACM literature finds "journalized", "journalled" and
> > "journaled" are all in use for this operation.
>
> I hate to get into these discussions, but I've used "journaled" a lot,
> so I feel I should chime in.
I noticed and IBM cannot even agree internally 8)
"Tivoli Storage Manager Journal Based Backup troubleshooting techniques
and solutions to common problems seen with journalized backups and the
journal database. This is from a 2005_November_07 Support Technical
Exchange Web seminar presented by TSM Support staff"
"IBM Journaled File System (JFS)"
> That would probably be more correct, but the use of "journal" as a verb
> has really gotten ingrained in file system developers brains. I
> personally haven't heard or used "journalized" and it would take some
> getting used to.
Mandrake use Journalized File System in various press articles. Mac
people seem to like journalized too and google shows it used in various
reviews and articles.
I think I'm going to follow this up with the professional bodies and see
if there is an opinion because either the computing world needs to agree
on a proper English name, or they need to agree on a new one and talk to
the dictionary people about it.
Alan
On Thu, 2008-05-01 at 00:20 +0100, Alan Cox wrote:
> > > A search of the ACM literature finds "journalized", "journalled" and
> > > "journaled" are all in use for this operation.
> >
> > I hate to get into these discussions, but I've used "journaled" a lot,
> > so I feel I should chime in.
>
> I noticed and IBM cannot even agree internally 8)
>
> "Tivoli Storage Manager Journal Based Backup troubleshooting techniques
> and solutions to common problems seen with journalized backups and the
> journal database. This is from a 2005_November_07 Support Technical
> Exchange Web seminar presented by TSM Support staff"
>
> "IBM Journaled File System (JFS)"
IBM's big. What can I say? :-)
> > That would probably be more correct, but the use of "journal" as a verb
> > has really gotten ingrained in file system developers brains. I
> > personally haven't heard or used "journalized" and it would take some
> > getting used to.
>
> Mandrake use Journalized File System in various press articles. Mac
> people seem to like journalized too and google shows it used in various
> reviews and articles.
I guess it's more common that I thought.
> I think I'm going to follow this up with the professional bodies and see
> if there is an opinion because either the computing world needs to agree
> on a proper English name, or they need to agree on a new one and talk to
> the dictionary people about it.
If there's some kind of consensus, I don't have strong feelings either
way.
--
David Kleikamp
IBM Linux Technology Center
> > I think I'm going to follow this up with the professional bodies and see
> > if there is an opinion because either the computing world needs to agree
> > on a proper English name, or they need to agree on a new one and talk to
> > the dictionary people about it.
>
> If there's some kind of consensus, I don't have strong feelings either
> way.
BCS: "BCS use the OED as the final arbiter, without the zeds though...so
journalise is what we'd use if we absolutely had to."
I don't know if anyone has the right ACM contacts to find out what the
other big professional body thinks ?
Alan
Then again, I would consider journalize to be the US version of journalise
> Date: Thu, 1 May 2008 00:20:18 +0100
> From: [email protected]
> To: [email protected]
> CC: [email protected]; [email protected]; [email protected]; [email protected]
> Subject: Re: [PATCH] ext3: Fix typos in messages and comments (journalled -> journaled)
>
>>> A search of the ACM literature finds "journalized", "journalled" and
>>> "journaled" are all in use for this operation.
>>
>> I hate to get into these discussions, but I've used "journaled" a lot,
>> so I feel I should chime in.
>
> I noticed and IBM cannot even agree internally 8)
>
> "Tivoli Storage Manager Journal Based Backup troubleshooting techniques
> and solutions to common problems seen with journalized backups and the
> journal database. This is from a 2005_November_07 Support Technical
> Exchange Web seminar presented by TSM Support staff"
>
> "IBM Journaled File System (JFS)"
>
>
>> That would probably be more correct, but the use of "journal" as a verb
>> has really gotten ingrained in file system developers brains. I
>> personally haven't heard or used "journalized" and it would take some
>> getting used to.
>
> Mandrake use Journalized File System in various press articles. Mac
> people seem to like journalized too and google shows it used in various
> reviews and articles.
>
> I think I'm going to follow this up with the professional bodies and see
> if there is an opinion because either the computing world needs to agree
> on a proper English name, or they need to agree on a new one and talk to
> the dictionary people about it.
>
>
> Alan
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
_________________________________________________________________
Windows Live Spaces ? your life, your Space. Click here to find out more.
http://get.live.com/spaces/overview-
On 4/30/08, Dave Kleikamp <[email protected]> wrote:
> I hate to get into these discussions, but I've used "journaled" a lot,
> so I feel I should chime in.
>
> Maybe it's different in the UK, but I've always understood that if the
> accent is not on the last syllable, then you do not double the final
> vowel: offer, offered. So if we accept the use of "journal" as a verb,
> "journaled" would be correct.
So I have been taught as well. Merriam-Webster says:
The word you've entered isn't in the dictionary. Click on a spelling
suggestion below or try again using the search bar above.
Suggestions for journalled:
1. journalese 2. journalized
3. journalize 4. journals
5. journalizer 6. journeyed
7. journal 8. journal box
9. Journalist 10. julienned
11. junketed 12. generally
13. generals 14. journaleses
15. Journalism 16. General
17. gillnetted 18. gingered
19. journalizes 20. gendered
I'd suggest using neither M-W or OED as sole references and accept
spellings from both. Past experience has shown me that this is one
area where there will *never* be consensus.
-sb
On Wed 30-04-08 10:43:30, Andrew Morton wrote:
> On Wed, 30 Apr 2008 17:06:15 +0200
> Jan Kara <[email protected]> wrote:
>
> > - "EXT3-fs: Cannot change journalled "
> > + "EXT3-fs: Cannot change journaled "
>
> hrm, who said?
>
> Dictionary.com recognises neither.
>
> google(journalled) = 520,000
> google(journaled) = 652,000
google.cz gives like 250k vs 519k, interesting. Anyway, I'm happy to
leave the decision on the proper spelling of the verb to people with better
English skills ;).
Honza
--
Jan Kara <[email protected]>
SUSE Labs, CR