diff options
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 04158ad74dbb..9494bb249390 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -803,7 +803,9 @@ static struct dquot_operations ext4_quota_operations = { | |||
803 | .acquire_dquot = ext4_acquire_dquot, | 803 | .acquire_dquot = ext4_acquire_dquot, |
804 | .release_dquot = ext4_release_dquot, | 804 | .release_dquot = ext4_release_dquot, |
805 | .mark_dirty = ext4_mark_dquot_dirty, | 805 | .mark_dirty = ext4_mark_dquot_dirty, |
806 | .write_info = ext4_write_info | 806 | .write_info = ext4_write_info, |
807 | .alloc_dquot = dquot_alloc, | ||
808 | .destroy_dquot = dquot_destroy, | ||
807 | }; | 809 | }; |
808 | 810 | ||
809 | static struct quotactl_ops ext4_qctl_operations = { | 811 | static struct quotactl_ops ext4_qctl_operations = { |
@@ -1142,8 +1144,7 @@ static int parse_options(char *options, struct super_block *sb, | |||
1142 | case Opt_grpjquota: | 1144 | case Opt_grpjquota: |
1143 | qtype = GRPQUOTA; | 1145 | qtype = GRPQUOTA; |
1144 | set_qf_name: | 1146 | set_qf_name: |
1145 | if ((sb_any_quota_enabled(sb) || | 1147 | if (sb_any_quota_loaded(sb) && |
1146 | sb_any_quota_suspended(sb)) && | ||
1147 | !sbi->s_qf_names[qtype]) { | 1148 | !sbi->s_qf_names[qtype]) { |
1148 | printk(KERN_ERR | 1149 | printk(KERN_ERR |
1149 | "EXT4-fs: Cannot change journaled " | 1150 | "EXT4-fs: Cannot change journaled " |
@@ -1182,8 +1183,7 @@ set_qf_name: | |||
1182 | case Opt_offgrpjquota: | 1183 | case Opt_offgrpjquota: |
1183 | qtype = GRPQUOTA; | 1184 | qtype = GRPQUOTA; |
1184 | clear_qf_name: | 1185 | clear_qf_name: |
1185 | if ((sb_any_quota_enabled(sb) || | 1186 | if (sb_any_quota_loaded(sb) && |
1186 | sb_any_quota_suspended(sb)) && | ||
1187 | sbi->s_qf_names[qtype]) { | 1187 | sbi->s_qf_names[qtype]) { |
1188 | printk(KERN_ERR "EXT4-fs: Cannot change " | 1188 | printk(KERN_ERR "EXT4-fs: Cannot change " |
1189 | "journaled quota options when " | 1189 | "journaled quota options when " |
@@ -1202,8 +1202,7 @@ clear_qf_name: | |||
1202 | case Opt_jqfmt_vfsv0: | 1202 | case Opt_jqfmt_vfsv0: |
1203 | qfmt = QFMT_VFS_V0; | 1203 | qfmt = QFMT_VFS_V0; |
1204 | set_qf_format: | 1204 | set_qf_format: |
1205 | if ((sb_any_quota_enabled(sb) || | 1205 | if (sb_any_quota_loaded(sb) && |
1206 | sb_any_quota_suspended(sb)) && | ||
1207 | sbi->s_jquota_fmt != qfmt) { | 1206 | sbi->s_jquota_fmt != qfmt) { |
1208 | printk(KERN_ERR "EXT4-fs: Cannot change " | 1207 | printk(KERN_ERR "EXT4-fs: Cannot change " |
1209 | "journaled quota options when " | 1208 | "journaled quota options when " |
@@ -1222,7 +1221,7 @@ set_qf_format: | |||
1222 | set_opt(sbi->s_mount_opt, GRPQUOTA); | 1221 | set_opt(sbi->s_mount_opt, GRPQUOTA); |
1223 | break; | 1222 | break; |
1224 | case Opt_noquota: | 1223 | case Opt_noquota: |
1225 | if (sb_any_quota_enabled(sb)) { | 1224 | if (sb_any_quota_loaded(sb)) { |
1226 | printk(KERN_ERR "EXT4-fs: Cannot change quota " | 1225 | printk(KERN_ERR "EXT4-fs: Cannot change quota " |
1227 | "options when quota turned on.\n"); | 1226 | "options when quota turned on.\n"); |
1228 | return 0; | 1227 | return 0; |