ext4: Use sb_any_quota_loaded() instead of sb_any_quota_enabled()
Subsystems (2)
Jan Kara
reviewerPATCH 1/1 ext4: Use sb_any_quota_loaded() instead of sb_any_quota_enabled()
Signed-off-by Jan Kara <[email protected]>
--- fs/ext4/super.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-)
fs/ext4/super.c +4 -7
@@ -1185,8 +1185,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 "
@@ -1225,8 +1224,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 "
@@ -1245,8 +1243,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 "
@@ -1265,7 +1262,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 ;
Signature · 1 line
1.5.2.4