From: Jan Kara Date: Fri, 31 Oct 2008 07:38:57 +0100 Subject: [Ocfs2-devel] [PATCH 07/27] ext4: Use sb_any_quota_loaded() instead of sb_any_quota_enabled() In-Reply-To: <12254351582004-git-send-email-jack@suse.cz> References: y <12254351572189-git-send-email-jack@suse.cz> <12254351571914-git-send-email-jack@suse.cz> <1225435157625-git-send-email-jack@suse.cz> <1225435157218-git-send-email-jack@suse.cz> <12254351571677-git-send-email-jack@suse.cz> <1225435157894-git-send-email-jack@suse.cz> <12254351582004-git-send-email-jack@suse.cz> Message-ID: <12254351581363-git-send-email-jack@suse.cz> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ocfs2-devel@oss.oracle.com Signed-off-by: Jan Kara --- fs/ext4/super.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index bdddea1..be34b66 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1139,8 +1139,7 @@ static int parse_options(char *options, struct super_block *sb, case Opt_grpjquota: qtype = GRPQUOTA; set_qf_name: - if ((sb_any_quota_enabled(sb) || - sb_any_quota_suspended(sb)) && + if (sb_any_quota_loaded(sb) && !sbi->s_qf_names[qtype]) { printk(KERN_ERR "EXT4-fs: Cannot change journaled " @@ -1179,8 +1178,7 @@ set_qf_name: case Opt_offgrpjquota: qtype = GRPQUOTA; clear_qf_name: - if ((sb_any_quota_enabled(sb) || - sb_any_quota_suspended(sb)) && + if (sb_any_quota_loaded(sb) && sbi->s_qf_names[qtype]) { printk(KERN_ERR "EXT4-fs: Cannot change " "journaled quota options when " @@ -1199,8 +1197,7 @@ clear_qf_name: case Opt_jqfmt_vfsv0: qfmt = QFMT_VFS_V0; set_qf_format: - if ((sb_any_quota_enabled(sb) || - sb_any_quota_suspended(sb)) && + if (sb_any_quota_loaded(sb) && sbi->s_jquota_fmt != qfmt) { printk(KERN_ERR "EXT4-fs: Cannot change " "journaled quota options when " @@ -1219,7 +1216,7 @@ set_qf_format: set_opt(sbi->s_mount_opt, GRPQUOTA); break; case Opt_noquota: - if (sb_any_quota_enabled(sb)) { + if (sb_any_quota_loaded(sb)) { printk(KERN_ERR "EXT4-fs: Cannot change quota " "options when quota turned on.\n"); return 0; -- 1.5.2.4