lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reiserfs: Use sb_any_quota_loaded() instead of sb_any_quota_enabled().

Browse Source 
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
Jan Kara
2008-08-20 18:16:36 +02:00
committed by Mark Fasheh
parent 17bd13b31c
commit 6929f89124
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/reiserfs/super.c
View File

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