diff options
| author | Jan Kara <jack@suse.cz> | 2008-08-20 18:14:35 +0200 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-01-05 17:36:56 +0100 |
| commit | 17bd13b31ce4fe7f789d8848e8cbc8cb42b10544 (patch) | |
| tree | ced03fa069a1493421b6c0b0c11e5a163b5dbed6 | |
| parent | ext3: Use sb_any_quota_loaded() instead of sb_any_quota_enabled() (diff) | |
| download | linux-17bd13b31ce4fe7f789d8848e8cbc8cb42b10544.tar.xz linux-17bd13b31ce4fe7f789d8848e8cbc8cb42b10544.zip | |
ext4: 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>
| -rw-r--r-- | 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 04158ad74dbb..49fcf8864e76 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1142,8 +1142,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 " @@ -1182,8 +1181,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 " @@ -1202,8 +1200,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 " @@ -1222,7 +1219,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; |