aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r--fs/ext4/super.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index cddf7f0e0fda..09d9359c8055 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1166,7 +1166,7 @@ set_qf_name:
1166 sb_any_quota_suspended(sb)) && 1166 sb_any_quota_suspended(sb)) &&
1167 !sbi->s_qf_names[qtype]) { 1167 !sbi->s_qf_names[qtype]) {
1168 printk(KERN_ERR 1168 printk(KERN_ERR
1169 "EXT4-fs: Cannot change journalled " 1169 "EXT4-fs: Cannot change journaled "
1170 "quota options when quota turned on.\n"); 1170 "quota options when quota turned on.\n");
1171 return 0; 1171 return 0;
1172 } 1172 }
@@ -1206,7 +1206,7 @@ clear_qf_name:
1206 sb_any_quota_suspended(sb)) && 1206 sb_any_quota_suspended(sb)) &&
1207 sbi->s_qf_names[qtype]) { 1207 sbi->s_qf_names[qtype]) {
1208 printk(KERN_ERR "EXT4-fs: Cannot change " 1208 printk(KERN_ERR "EXT4-fs: Cannot change "
1209 "journalled quota options when " 1209 "journaled quota options when "
1210 "quota turned on.\n"); 1210 "quota turned on.\n");
1211 return 0; 1211 return 0;
1212 } 1212 }
@@ -1350,14 +1350,14 @@ set_qf_format:
1350 } 1350 }
1351 1351
1352 if (!sbi->s_jquota_fmt) { 1352 if (!sbi->s_jquota_fmt) {
1353 printk(KERN_ERR "EXT4-fs: journalled quota format " 1353 printk(KERN_ERR "EXT4-fs: journaled quota format "
1354 "not specified.\n"); 1354 "not specified.\n");
1355 return 0; 1355 return 0;
1356 } 1356 }
1357 } else { 1357 } else {
1358 if (sbi->s_jquota_fmt) { 1358 if (sbi->s_jquota_fmt) {
1359 printk(KERN_ERR "EXT4-fs: journalled quota format " 1359 printk(KERN_ERR "EXT4-fs: journaled quota format "
1360 "specified with no journalling " 1360 "specified with no journaling "
1361 "enabled.\n"); 1361 "enabled.\n");
1362 return 0; 1362 return 0;
1363 } 1363 }
@@ -1598,7 +1598,7 @@ static void ext4_orphan_cleanup (struct super_block * sb,
1598 int ret = ext4_quota_on_mount(sb, i); 1598 int ret = ext4_quota_on_mount(sb, i);
1599 if (ret < 0) 1599 if (ret < 0)
1600 printk(KERN_ERR 1600 printk(KERN_ERR
1601 "EXT4-fs: Cannot turn on journalled " 1601 "EXT4-fs: Cannot turn on journaled "
1602 "quota: error %d\n", ret); 1602 "quota: error %d\n", ret);
1603 } 1603 }
1604 } 1604 }
@@ -3123,7 +3123,7 @@ static int ext4_release_dquot(struct dquot *dquot)
3123 3123
3124static int ext4_mark_dquot_dirty(struct dquot *dquot) 3124static int ext4_mark_dquot_dirty(struct dquot *dquot)
3125{ 3125{
3126 /* Are we journalling quotas? */ 3126 /* Are we journaling quotas? */
3127 if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] || 3127 if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
3128 EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) { 3128 EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
3129 dquot_mark_dquot_dirty(dquot); 3129 dquot_mark_dquot_dirty(dquot);