From: akpm@linux-foundation.org Subject: - ext4-fix-typos-in-messages-and-comments-journalled-journaled.patch removed from -mm tree Date: Wed, 14 May 2008 14:22:22 -0700 Message-ID: <200805142122.m4ELMMVc021591@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org To: jack@suse.cz, linux-ext4@vger.kernel.org, mm-commits@vger.kernel.org Return-path: Sender: mm-commits-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org The patch titled ext4: fix typos in messages and comments (journalled -> journaled) has been removed from the -mm tree. Its filename was ext4-fix-typos-in-messages-and-comments-journalled-journaled.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ext4: fix typos in messages and comments (journalled -> journaled) From: Jan Kara Cc: Signed-off-by: Jan Kara Signed-off-by: Andrew Morton --- fs/ext4/super.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN fs/ext4/super.c~ext4-fix-typos-in-messages-and-comments-journalled-journaled fs/ext4/super.c --- a/fs/ext4/super.c~ext4-fix-typos-in-messages-and-comments-journalled-journaled +++ a/fs/ext4/super.c @@ -1167,7 +1167,7 @@ static int parse_options (char *options, 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; } @@ -1205,7 +1205,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; } @@ -1339,14 +1339,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; } @@ -1587,7 +1587,7 @@ static void ext4_orphan_cleanup (struct 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); } } @@ -3112,7 +3112,7 @@ static int ext4_release_dquot(struct dqu 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); _ Patches currently in -mm which might be from jack@suse.cz are origin.patch ext3-fix-synchronization-of-quota-files-in-journal=data-mode.patch ext3-fix-typos-in-messages-and-comments-journalled-journaled.patch ext3-correct-mount-option-parsing-to-detect-when-quota-options-can-be-changed.patch reiserfs-fix-synchronization-of-quota-files-in-journal=data-mode.patch reiserfs-fix-typos-in-messages-and-comments-journalled-journaled.patch reiserfs-correct-mount-option-parsing-to-detect-when-quota-options-can-be-changed.patch