aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2008-08-20 12:11:50 -0400
committerMark Fasheh <mfasheh@suse.com>2009-01-05 11:36:56 -0500
commitee0d5ffe0da2aa992004447113e28622621a983f (patch)
tree602c66693af5f1cadbc4f6c3d1475ff048aa94f5 /fs/ext3
parentf55abc0fb9c3189de3da829adf3220322c0da43e (diff)
ext3: Use sb_any_quota_loaded() instead of sb_any_quota_enabled()
Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index f6c94f232ec1..250ec53195cb 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1035,8 +1035,7 @@ static int parse_options (char *options, struct super_block *sb,
1035 case Opt_grpjquota: 1035 case Opt_grpjquota:
1036 qtype = GRPQUOTA; 1036 qtype = GRPQUOTA;
1037set_qf_name: 1037set_qf_name:
1038 if ((sb_any_quota_enabled(sb) || 1038 if (sb_any_quota_loaded(sb) &&
1039 sb_any_quota_suspended(sb)) &&
1040 !sbi->s_qf_names[qtype]) { 1039 !sbi->s_qf_names[qtype]) {
1041 printk(KERN_ERR 1040 printk(KERN_ERR
1042 "EXT3-fs: Cannot change journaled " 1041 "EXT3-fs: Cannot change journaled "
@@ -1075,8 +1074,7 @@ set_qf_name:
1075 case Opt_offgrpjquota: 1074 case Opt_offgrpjquota:
1076 qtype = GRPQUOTA; 1075 qtype = GRPQUOTA;
1077clear_qf_name: 1076clear_qf_name:
1078 if ((sb_any_quota_enabled(sb) || 1077 if (sb_any_quota_loaded(sb) &&
1079 sb_any_quota_suspended(sb)) &&
1080 sbi->s_qf_names[qtype]) { 1078 sbi->s_qf_names[qtype]) {
1081 printk(KERN_ERR "EXT3-fs: Cannot change " 1079 printk(KERN_ERR "EXT3-fs: Cannot change "
1082 "journaled quota options when " 1080 "journaled quota options when "
@@ -1095,8 +1093,7 @@ clear_qf_name:
1095 case Opt_jqfmt_vfsv0: 1093 case Opt_jqfmt_vfsv0:
1096 qfmt = QFMT_VFS_V0; 1094 qfmt = QFMT_VFS_V0;
1097set_qf_format: 1095set_qf_format:
1098 if ((sb_any_quota_enabled(sb) || 1096 if (sb_any_quota_loaded(sb) &&
1099 sb_any_quota_suspended(sb)) &&
1100 sbi->s_jquota_fmt != qfmt) { 1097 sbi->s_jquota_fmt != qfmt) {
1101 printk(KERN_ERR "EXT3-fs: Cannot change " 1098 printk(KERN_ERR "EXT3-fs: Cannot change "
1102 "journaled quota options when " 1099 "journaled quota options when "
@@ -1115,8 +1112,7 @@ set_qf_format:
1115 set_opt(sbi->s_mount_opt, GRPQUOTA); 1112 set_opt(sbi->s_mount_opt, GRPQUOTA);
1116 break; 1113 break;
1117 case Opt_noquota: 1114 case Opt_noquota:
1118 if (sb_any_quota_enabled(sb) || 1115 if (sb_any_quota_loaded(sb)) {
1119 sb_any_quota_suspended(sb)) {
1120 printk(KERN_ERR "EXT3-fs: Cannot change quota " 1116 printk(KERN_ERR "EXT3-fs: Cannot change quota "
1121 "options when quota turned on.\n"); 1117 "options when quota turned on.\n");
1122 return 0; 1118 return 0;