The patch titled ext4: use sb_any_quota_loaded() instead of sb_any_quota_enabled() has been added to the -mm tree. Its filename is ext4-use-sb_any_quota_loaded-instead-of-sb_any_quota_enabled.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ext4: use sb_any_quota_loaded() instead of sb_any_quota_enabled() From: Jan Kara <jack@xxxxxxx> Cc: <linux-ext4@xxxxxxxxxxxxxxx> Signed-off-by: Jan Kara <jack@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ext4/super.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff -puN fs/ext4/super.c~ext4-use-sb_any_quota_loaded-instead-of-sb_any_quota_enabled fs/ext4/super.c --- a/fs/ext4/super.c~ext4-use-sb_any_quota_loaded-instead-of-sb_any_quota_enabled +++ a/fs/ext4/super.c @@ -1142,8 +1142,7 @@ static int parse_options(char *options, 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; _ Patches currently in -mm which might be from jack@xxxxxxx are linux-next.patch ext4-fix-a-bug-accessing-freed-memory-in-ext4_abort.patch ext3-fix-a-bug-accessing-freed-memory-in-ext3_abort.patch quota-add-callbacks-for-allocating-and-destroying-dquot-structures.patch quota-increase-size-of-variables-for-limits-and-inode-usage.patch quota-remove-bogus-optimization-in-check_idq-and-check_bdq.patch quota-make-_suspended-just-a-flag.patch quota-permit-separately-enabling-quota-accounting-and-enforcing-limits.patch ext3-use-sb_any_quota_loaded-instead-of-sb_any_quota_enabled.patch ext4-use-sb_any_quota_loaded-instead-of-sb_any_quota_enabled.patch reiserfs-use-sb_any_quota_loaded-instead-of-sb_any_quota_enabled.patch quota-remove-compatibility-function-sb_any_quota_enabled.patch quota-introduce-dquot_quota_sys_file-flag.patch quota-move-quotaio_vh-from-include-linux-to-fs.patch quota-split-off-quota-tree-handling-into-a-separate-file.patch quota-convert-union-in-mem_dqinfo-to-a-pointer.patch quota-convert-union-in-mem_dqinfo-to-a-pointer-cleanup.patch quota-support-64-bit-quota-format.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html