tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ext4: fix typos in messages and comments (journalled -> journaled)

Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

authored by Jan Kara and committed by Theodore Ts'o 2c8be6b2 0623543b

+7 -7
unified split
+7 -7
fs/ext4/super.c
··· 1166 sb_any_quota_suspended(sb)) && 1167 !sbi->s_qf_names[qtype]) { 1168 printk(KERN_ERR 1169 - "EXT4-fs: Cannot change journalled " 1170 "quota options when quota turned on.\n"); 1171 return 0; 1172 } ··· 1206 sb_any_quota_suspended(sb)) && 1207 sbi->s_qf_names[qtype]) { 1208 printk(KERN_ERR "EXT4-fs: Cannot change " 1209 - "journalled quota options when " 1210 "quota turned on.\n"); 1211 return 0; 1212 } ··· 1350 } 1351 1352 if (!sbi->s_jquota_fmt) { 1353 - printk(KERN_ERR "EXT4-fs: journalled quota format " 1354 "not specified.\n"); 1355 return 0; 1356 } 1357 } else { 1358 if (sbi->s_jquota_fmt) { 1359 - printk(KERN_ERR "EXT4-fs: journalled quota format " 1360 - "specified with no journalling " 1361 "enabled.\n"); 1362 return 0; 1363 } ··· 1598 int ret = ext4_quota_on_mount(sb, i); 1599 if (ret < 0) 1600 printk(KERN_ERR 1601 - "EXT4-fs: Cannot turn on journalled " 1602 "quota: error %d\n", ret); 1603 } 1604 } ··· 3123 3124 static int ext4_mark_dquot_dirty(struct dquot *dquot) 3125 { 3126 - /* Are we journalling quotas? */ 3127 if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] || 3128 EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) { 3129 dquot_mark_dquot_dirty(dquot);
··· 1166 sb_any_quota_suspended(sb)) && 1167 !sbi->s_qf_names[qtype]) { 1168 printk(KERN_ERR 1169 + "EXT4-fs: Cannot change journaled " 1170 "quota options when quota turned on.\n"); 1171 return 0; 1172 } ··· 1206 sb_any_quota_suspended(sb)) && 1207 sbi->s_qf_names[qtype]) { 1208 printk(KERN_ERR "EXT4-fs: Cannot change " 1209 + "journaled quota options when " 1210 "quota turned on.\n"); 1211 return 0; 1212 } ··· 1350 } 1351 1352 if (!sbi->s_jquota_fmt) { 1353 + printk(KERN_ERR "EXT4-fs: journaled quota format " 1354 "not specified.\n"); 1355 return 0; 1356 } 1357 } else { 1358 if (sbi->s_jquota_fmt) { 1359 + printk(KERN_ERR "EXT4-fs: journaled quota format " 1360 + "specified with no journaling " 1361 "enabled.\n"); 1362 return 0; 1363 } ··· 1598 int ret = ext4_quota_on_mount(sb, i); 1599 if (ret < 0) 1600 printk(KERN_ERR 1601 + "EXT4-fs: Cannot turn on journaled " 1602 "quota: error %d\n", ret); 1603 } 1604 } ··· 3123 3124 static int ext4_mark_dquot_dirty(struct dquot *dquot) 3125 { 3126 + /* Are we journaling quotas? */ 3127 if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] || 3128 EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) { 3129 dquot_mark_dquot_dirty(dquot);