|
@@ -994,8 +994,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
|
|
|
if (c == 'u' || c == 'g') {
|
|
|
int qtype = c == 'u' ? USRQUOTA : GRPQUOTA;
|
|
|
|
|
|
- if ((sb_any_quota_enabled(s) ||
|
|
|
- sb_any_quota_suspended(s)) &&
|
|
|
+ if (sb_any_quota_loaded(s) &&
|
|
|
(!*arg != !REISERFS_SB(s)->s_qf_names[qtype])) {
|
|
|
reiserfs_warning(s,
|
|
|
"reiserfs_parse_options: cannot change journaled quota options when quota turned on.");
|
|
@@ -1041,8 +1040,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
|
|
|
"reiserfs_parse_options: unknown quota format specified.");
|
|
|
return 0;
|
|
|
}
|
|
|
- if ((sb_any_quota_enabled(s) ||
|
|
|
- sb_any_quota_suspended(s)) &&
|
|
|
+ if (sb_any_quota_loaded(s) &&
|
|
|
*qfmt != REISERFS_SB(s)->s_jquota_fmt) {
|
|
|
reiserfs_warning(s,
|
|
|
"reiserfs_parse_options: cannot change journaled quota options when quota turned on.");
|
|
@@ -1067,7 +1065,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
|
|
|
}
|
|
|
/* This checking is not precise wrt the quota type but for our purposes it is sufficient */
|
|
|
if (!(*mount_options & (1 << REISERFS_QUOTA))
|
|
|
- && sb_any_quota_enabled(s)) {
|
|
|
+ && sb_any_quota_loaded(s)) {
|
|
|
reiserfs_warning(s,
|
|
|
"reiserfs_parse_options: quota options must be present when quota is turned on.");
|
|
|
return 0;
|