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

ext4: 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:14:35 +02:00
committed by Mark Fasheh
parent ee0d5ffe0d
commit 17bd13b31c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ext4/super.c
View File

@@ -1142,8 +1142,7 @@ static int parse_options(char *options, struct super_block *sb,
case Opt_grpjquota: case Opt_grpjquota:
qtype = GRPQUOTA; qtype = GRPQUOTA;
set_qf_name: set_qf_name:
if ((sb_any_quota_enabled(sb) || if (sb_any_quota_loaded(sb) &&
sb_any_quota_suspended(sb)) &&
!sbi->s_qf_names[qtype]) { !sbi->s_qf_names[qtype]) {
printk(KERN_ERR printk(KERN_ERR
"EXT4-fs: Cannot change journaled " "EXT4-fs: Cannot change journaled "
@@ -1182,8 +1181,7 @@ set_qf_name:
case Opt_offgrpjquota: case Opt_offgrpjquota:
qtype = GRPQUOTA; qtype = GRPQUOTA;
clear_qf_name: clear_qf_name:
if ((sb_any_quota_enabled(sb) || if (sb_any_quota_loaded(sb) &&
sb_any_quota_suspended(sb)) &&
sbi->s_qf_names[qtype]) { sbi->s_qf_names[qtype]) {
printk(KERN_ERR "EXT4-fs: Cannot change " printk(KERN_ERR "EXT4-fs: Cannot change "
"journaled quota options when " "journaled quota options when "
@@ -1202,8 +1200,7 @@ clear_qf_name:
case Opt_jqfmt_vfsv0: case Opt_jqfmt_vfsv0:
qfmt = QFMT_VFS_V0; qfmt = QFMT_VFS_V0;
set_qf_format: set_qf_format:
if ((sb_any_quota_enabled(sb) || if (sb_any_quota_loaded(sb) &&
sb_any_quota_suspended(sb)) &&
sbi->s_jquota_fmt != qfmt) { sbi->s_jquota_fmt != qfmt) {
printk(KERN_ERR "EXT4-fs: Cannot change " printk(KERN_ERR "EXT4-fs: Cannot change "
"journaled quota options when " "journaled quota options when "
@@ -1222,7 +1219,7 @@ set_qf_format:
set_opt(sbi->s_mount_opt, GRPQUOTA); set_opt(sbi->s_mount_opt, GRPQUOTA);
break; break;
case Opt_noquota: case Opt_noquota:
if (sb_any_quota_enabled(sb)) { if (sb_any_quota_loaded(sb)) {
printk(KERN_ERR "EXT4-fs: Cannot change quota " printk(KERN_ERR "EXT4-fs: Cannot change quota "
"options when quota turned on.\n"); "options when quota turned on.\n");
return 0; return 0;