The patch titled reiserfs: fix typos in messages and comments (journalled -> journaled) has been added to the -mm tree. Its filename is reiserfs-fix-typos-in-messages-and-comments-journalled-journaled.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: reiserfs: fix typos in messages and comments (journalled -> journaled) From: Jan Kara <jack@xxxxxxx> Cc: <reiserfs-devel@xxxxxxxxxxxxxxx> Signed-off-by: Jan Kara <jack@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiserfs/super.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN fs/reiserfs/super.c~reiserfs-fix-typos-in-messages-and-comments-journalled-journaled fs/reiserfs/super.c --- a/fs/reiserfs/super.c~reiserfs-fix-typos-in-messages-and-comments-journalled-journaled +++ a/fs/reiserfs/super.c @@ -182,7 +182,7 @@ static int finish_unfinished(struct supe int ret = reiserfs_quota_on_mount(s, i); if (ret < 0) reiserfs_warning(s, - "reiserfs: cannot turn on journalled quota: error %d", + "reiserfs: cannot turn on journaled quota: error %d", ret); } } @@ -994,7 +994,7 @@ static int reiserfs_parse_options(struct if (sb_any_quota_enabled(s)) { reiserfs_warning(s, - "reiserfs_parse_options: cannot change journalled quota options when quota turned on."); + "reiserfs_parse_options: cannot change journaled quota options when quota turned on."); return 0; } if (*arg) { /* Some filename specified? */ @@ -1039,7 +1039,7 @@ static int reiserfs_parse_options(struct #else if (c == 'u' || c == 'g' || c == 'f') { reiserfs_warning(s, - "reiserfs_parse_options: journalled quota options not supported."); + "reiserfs_parse_options: journaled quota options not supported."); return 0; } #endif @@ -1050,7 +1050,7 @@ static int reiserfs_parse_options(struct && (REISERFS_SB(s)->s_qf_names[USRQUOTA] || REISERFS_SB(s)->s_qf_names[GRPQUOTA])) { reiserfs_warning(s, - "reiserfs_parse_options: journalled quota format not specified."); + "reiserfs_parse_options: journaled quota format not specified."); return 0; } /* This checking is not precise wrt the quota type but for our purposes it is sufficient */ @@ -1980,7 +1980,7 @@ static int reiserfs_release_dquot(struct static int reiserfs_mark_dquot_dirty(struct dquot *dquot) { - /* Are we journalling quotas? */ + /* Are we journaling quotas? */ if (REISERFS_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] || REISERFS_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) { dquot_mark_dquot_dirty(dquot); _ Patches currently in -mm which might be from jack@xxxxxxx are origin.patch isofs-fix-access-to-unallocated-memory-when-reading-corrupted-filesystem.patch quota-le_add_cpu-conversion.patch ext4-fix-mount-messages-when-quota-disabled.patch ext3-fix-synchronization-of-quota-files-in-journal=data-mode.patch ext4-fix-synchronization-of-quota-files-in-journal=data-mode.patch reiserfs-fix-synchronization-of-quota-files-in-journal=data-mode.patch ext3-fix-typos-in-messages-and-comments-journalled-journaled.patch ext4-fix-typos-in-messages-and-comments-journalled-journaled.patch reiserfs-fix-typos-in-messages-and-comments-journalled-journaled.patch quota-add-a-convenience-macro-for-filesystems.patch ext3-correct-mount-option-parsing-to-detect-when-quota-options-can-be-changed.patch ext4-correct-mount-option-parsing-to-detect-when-quota-options-can-be-changed.patch reiserfs-correct-mount-option-parsing-to-detect-when-quota-options-can-be-changed.patch -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html