|
@@ -1020,7 +1020,7 @@ static int parse_options (char *options, struct super_block *sb,
|
|
set_qf_name:
|
|
set_qf_name:
|
|
if (sb_any_quota_enabled(sb)) {
|
|
if (sb_any_quota_enabled(sb)) {
|
|
printk(KERN_ERR
|
|
printk(KERN_ERR
|
|
- "EXT3-fs: Cannot change journalled "
|
|
|
|
|
|
+ "EXT3-fs: Cannot change journaled "
|
|
"quota options when quota turned on.\n");
|
|
"quota options when quota turned on.\n");
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -1058,7 +1058,7 @@ set_qf_name:
|
|
clear_qf_name:
|
|
clear_qf_name:
|
|
if (sb_any_quota_enabled(sb)) {
|
|
if (sb_any_quota_enabled(sb)) {
|
|
printk(KERN_ERR "EXT3-fs: Cannot change "
|
|
printk(KERN_ERR "EXT3-fs: Cannot change "
|
|
- "journalled quota options when "
|
|
|
|
|
|
+ "journaled quota options when "
|
|
"quota turned on.\n");
|
|
"quota turned on.\n");
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -1169,14 +1169,14 @@ clear_qf_name:
|
|
}
|
|
}
|
|
|
|
|
|
if (!sbi->s_jquota_fmt) {
|
|
if (!sbi->s_jquota_fmt) {
|
|
- printk(KERN_ERR "EXT3-fs: journalled quota format "
|
|
|
|
|
|
+ printk(KERN_ERR "EXT3-fs: journaled quota format "
|
|
"not specified.\n");
|
|
"not specified.\n");
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (sbi->s_jquota_fmt) {
|
|
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");
|
|
"enabled.\n");
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -1370,7 +1370,7 @@ static void ext3_orphan_cleanup (struct super_block * sb,
|
|
int ret = ext3_quota_on_mount(sb, i);
|
|
int ret = ext3_quota_on_mount(sb, i);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
printk(KERN_ERR
|
|
printk(KERN_ERR
|
|
- "EXT3-fs: Cannot turn on journalled "
|
|
|
|
|
|
+ "EXT3-fs: Cannot turn on journaled "
|
|
"quota: error %d\n", ret);
|
|
"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)
|
|
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] ||
|
|
if (EXT3_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
|
|
EXT3_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
|
|
EXT3_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
|
|
dquot_mark_dquot_dirty(dquot);
|
|
dquot_mark_dquot_dirty(dquot);
|