From: Dmitry Monakhov Subject: [PATCH 4/5] ext4: add project quota support Date: Thu, 18 Mar 2010 17:02:49 +0300 Message-ID: <1268920970-9061-5-git-send-email-dmonakhov@openvz.org> References: <1268920970-9061-1-git-send-email-dmonakhov@openvz.org> <1268920970-9061-2-git-send-email-dmonakhov@openvz.org> <1268920970-9061-3-git-send-email-dmonakhov@openvz.org> <1268920970-9061-4-git-send-email-dmonakhov@openvz.org> Cc: linux-fsdevel@vger.kernel.org, tytso@mit.edu, adilger@sun.com, hch@infradead.org, jack@suse.cz, david@fromorbit.com, viro@ZenIV.linux.org.uk, xemul@openvz.org, Dmitry Monakhov To: linux-ext4@vger.kernel.org Return-path: Received: from mail-bw0-f209.google.com ([209.85.218.209]:55608 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753398Ab0CRODH (ORCPT ); Thu, 18 Mar 2010 10:03:07 -0400 In-Reply-To: <1268920970-9061-4-git-send-email-dmonakhov@openvz.org> Sender: linux-ext4-owner@vger.kernel.org List-ID: Both regular and journaled quota are supported. --- fs/ext4/ext4.h | 1 + fs/ext4/super.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++------ fs/quota/dquot.c | 2 +- 3 files changed, 58 insertions(+), 9 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 5df54ae..3fa3602 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -745,6 +745,7 @@ struct ext4_inode_info { #define EXT4_MOUNT_ERRORS_PANIC 0x00040 /* Panic on errors */ #define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */ #define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/ +#define EXT4_MOUNT_PRJQUOTA 0x00200 /* Project quota support */ #define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */ #define EXT4_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */ #define EXT4_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */ diff --git a/fs/ext4/super.c b/fs/ext4/super.c index ddb4588..43a525e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -834,11 +834,18 @@ static inline void ext4_show_quota_options(struct seq_file *seq, if (sbi->s_qf_names[GRPQUOTA]) seq_printf(seq, ",grpjquota=%s", sbi->s_qf_names[GRPQUOTA]); + if (sbi->s_qf_names[PRJQUOTA]) + seq_printf(seq, ",prjjquota=%s", sbi->s_qf_names[PRJQUOTA]); + if (test_opt(sb, USRQUOTA)) seq_puts(seq, ",usrquota"); if (test_opt(sb, GRPQUOTA)) seq_puts(seq, ",grpquota"); + + if (test_opt(sb, PRJQUOTA)) + seq_puts(seq, ",prjquota"); + #endif } @@ -1039,8 +1046,8 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page, } #ifdef CONFIG_QUOTA -#define QTYPE2NAME(t) ((t) == USRQUOTA ? "user" : "group") -#define QTYPE2MOPT(on, t) ((t) == USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA)) +static char *quotatypes[] = INITQFNAMES; +#define QTYPE2NAME(t) (quotatypes[t]) static int ext4_write_dquot(struct dquot *dquot); static int ext4_acquire_dquot(struct dquot *dquot); @@ -1136,10 +1143,11 @@ enum { Opt_journal_checksum, Opt_journal_async_commit, Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback, Opt_data_err_abort, Opt_data_err_ignore, - Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, + Opt_usrjquota, Opt_grpjquota, Opt_prjjquota, Opt_offusrjquota, + Opt_offgrpjquota, Opt_offprjjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, - Opt_resize, Opt_usrquota, Opt_grpquota, Opt_i_version, + Opt_resize, Opt_usrquota, Opt_grpquota, Opt_prjquota, Opt_i_version, Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_block_validity, Opt_noblock_validity, Opt_inode_readahead_blks, Opt_journal_ioprio, @@ -1189,10 +1197,13 @@ static const match_table_t tokens = { {Opt_usrjquota, "usrjquota=%s"}, {Opt_offgrpjquota, "grpjquota="}, {Opt_grpjquota, "grpjquota=%s"}, + {Opt_offprjjquota, "prjjquota="}, + {Opt_prjjquota, "prjjquota=%s"}, {Opt_jqfmt_vfsold, "jqfmt=vfsold"}, {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"}, {Opt_jqfmt_vfsv1, "jqfmt=vfsv1"}, {Opt_grpquota, "grpquota"}, + {Opt_prjquota, "prjquota"}, {Opt_noquota, "noquota"}, {Opt_quota, "quota"}, {Opt_usrquota, "usrquota"}, @@ -1512,6 +1523,16 @@ static int parse_options(char *options, struct super_block *sb, if (!set_qf_name(sb, GRPQUOTA, &args[0])) return 0; break; + + case Opt_prjjquota: +#ifdef CONFIG_PROJECT_ID + if (!set_qf_name(sb, PRJQUOTA, &args[0])) + return 0; +#else + ext4_msg(sb, KERN_ERR, + "project quota options not supported"); +#endif + break; case Opt_offusrjquota: if (!clear_qf_name(sb, USRQUOTA)) return 0; @@ -1520,7 +1541,15 @@ static int parse_options(char *options, struct super_block *sb, if (!clear_qf_name(sb, GRPQUOTA)) return 0; break; - + case Opt_offprjjquota: +#ifdef CONFIG_PROJECT_ID + if (!clear_qf_name(sb, PRJQUOTA)) + return 0; +#else + ext4_msg(sb, KERN_ERR, + "project quota options not supported"); +#endif + break; case Opt_jqfmt_vfsold: qfmt = QFMT_VFS_OLD; goto set_qf_format; @@ -1548,6 +1577,15 @@ set_qf_format: set_opt(sbi->s_mount_opt, QUOTA); set_opt(sbi->s_mount_opt, GRPQUOTA); break; + case Opt_prjquota: +#ifdef CONFIG_PROJECT_ID + set_opt(sbi->s_mount_opt, QUOTA); + set_opt(sbi->s_mount_opt, PRJQUOTA); +#else + ext4_msg(sb, KERN_ERR, + "project quota options not supported"); +#endif + break; case Opt_noquota: if (sb_any_quota_loaded(sb)) { ext4_msg(sb, KERN_ERR, "Cannot change quota " @@ -1557,18 +1595,22 @@ set_qf_format: clear_opt(sbi->s_mount_opt, QUOTA); clear_opt(sbi->s_mount_opt, USRQUOTA); clear_opt(sbi->s_mount_opt, GRPQUOTA); + clear_opt(sbi->s_mount_opt, PRJQUOTA); break; #else case Opt_quota: case Opt_usrquota: case Opt_grpquota: + case Opt_prjquota: ext4_msg(sb, KERN_ERR, "quota options not supported"); break; case Opt_usrjquota: case Opt_grpjquota: + case Opt_prjjquota: case Opt_offusrjquota: case Opt_offgrpjquota: + case Opt_offprjjquota: case Opt_jqfmt_vfsold: case Opt_jqfmt_vfsv0: case Opt_jqfmt_vfsv1: @@ -1695,14 +1737,19 @@ set_qf_format: } } #ifdef CONFIG_QUOTA - if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { + if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA] || + sbi->s_qf_names[PRJQUOTA]) { if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA]) clear_opt(sbi->s_mount_opt, USRQUOTA); if (test_opt(sb, GRPQUOTA) && sbi->s_qf_names[GRPQUOTA]) clear_opt(sbi->s_mount_opt, GRPQUOTA); - if (test_opt(sb, GRPQUOTA) || test_opt(sb, USRQUOTA)) { + if (test_opt(sb, PRJQUOTA) && sbi->s_qf_names[PRJQUOTA]) + clear_opt(sbi->s_mount_opt, PRJQUOTA); + + if (test_opt(sb, GRPQUOTA) || test_opt(sb, USRQUOTA) || + test_opt(sb, PRJQUOTA)) { ext4_msg(sb, KERN_ERR, "old and new quota " "format mixing"); return 0; @@ -3868,7 +3915,8 @@ static int ext4_mark_dquot_dirty(struct dquot *dquot) { /* Are we journaling quotas? */ if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] || - EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) { + EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA] || + EXT4_SB(dquot->dq_sb)->s_qf_names[PRJQUOTA]) { dquot_mark_dquot_dirty(dquot); return ext4_write_dquot(dquot); } else { diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 3590888..73ef888 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -1807,7 +1807,7 @@ int dquot_transfer(struct inode *inode, struct iattr *iattr) #ifdef CONFIG_PROJECT_ID if (iattr->ia_valid & ATTR_PRJID && iattr->ia_prjid != inode->i_prjid) { mask |= 1 << PRJQUOTA; - chid[GRPQUOTA] = iattr->ia_prjid; + chid[PRJQUOTA] = iattr->ia_prjid; } #endif if (sb_any_quota_active(inode->i_sb) && !IS_NOQUOTA(inode)) { -- 1.6.6.1