| Message ID | 1426705497-22158-4-git-send-email-lixi@ddn.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu 19-03-15 04:04:55, Li Xi wrote: > This patch adds mount options for enabling/disabling project quota > accounting and enforcement. A new specific inode is also used for > project quota accounting. Here we still don't have resolved the problem that inode number 11 may be used. Please note that in the changelog as FIXME so that we don't forget. > @@ -987,6 +988,7 @@ struct ext4_inode_info { > #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */ > #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ > #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ > +#define EXT4_MOUNT_PRJJQUOTA 0x2000000 /* Journaled Project quota */ > #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ > #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ > #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */ I'm ok with the fact that you removed support for project quota files not in system files. However why do you keep the PRJJQUOTA mount option then? Quota tools are clever enough to query kernel for enabled quota without checking for mount options these days. So they don't need the mount option for anything. And kernel doesn't need the option for anything either (usrquota and grpquota mount options are there only for quota in standard files case). Honza
On Mar 18, 2015, at 1:04 PM, Li Xi <pkuelelixi@gmail.com> wrote: > > This patch adds mount options for enabling/disabling project quota > accounting and enforcement. A new specific inode is also used for > project quota accounting. > > Signed-off-by: Li Xi <lixi@ddn.com> > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> > Reviewed-by: Jan Kara <jack@suse.cz> > --- > fs/ext4/ext4.h | 9 +++++- > fs/ext4/super.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++------ > 2 files changed, 74 insertions(+), 11 deletions(-) > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index 7acb2da..ad650d4 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -208,6 +208,7 @@ struct ext4_io_submit { > #define EXT4_UNDEL_DIR_INO 6 /* Undelete directory inode */ > #define EXT4_RESIZE_INO 7 /* Reserved group descriptors inode */ > #define EXT4_JOURNAL_INO 8 /* Journal inode */ > +#define EXT4_PRJ_QUOTA_INO 11 /* Project quota inode */ To me it doesn't make sense to reserve this inode number if we aren't going to use it for project quota. I think it is just confusing for developers that incorrectly think this is correct instead of checking s_prj_quota_inum. > /* First non-reserved inode for old ext4 filesystems */ > #define EXT4_GOOD_OLD_FIRST_INO 11 > @@ -987,6 +988,7 @@ struct ext4_inode_info { > #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */ > #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ > #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ > +#define EXT4_MOUNT_PRJJQUOTA 0x2000000 /* Journaled Project quota */ > #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ > #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ > #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */ > @@ -1169,7 +1171,8 @@ struct ext4_super_block { > __le32 s_overhead_clusters; /* overhead blocks/clusters in fs */ > __le32 s_backup_bgs[2]; /* groups with sparse_super2 SBs */ > __u8 s_encrypt_algos[4]; /* Encryption algorithms in use */ > - __le32 s_reserved[105]; /* Padding to the end of the block */ > + __le32 s_prj_quota_inum; /* inode for tracking project quota */ > + __le32 s_reserved[104]; /* Padding to the end of the block */ > __le32 s_checksum; /* crc32c(superblock) */ > }; > > @@ -1184,7 +1187,7 @@ struct ext4_super_block { > #define EXT4_MF_FS_ABORTED 0x0002 /* Fatal error detected */ > > /* Number of quota types we support */ > -#define EXT4_MAXQUOTAS 2 > +#define EXT4_MAXQUOTAS 3 > > /* > * fourth extended-fs super-block data in memory > @@ -1376,6 +1379,8 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) > ino == EXT4_BOOT_LOADER_INO || > ino == EXT4_JOURNAL_INO || > ino == EXT4_RESIZE_INO || > + (EXT4_FIRST_INO(sb) > EXT4_PRJ_QUOTA_INO && > + ino == EXT4_PRJ_QUOTA_INO) || This check isn't correct either, if s_prj_quota_inum != EXT4_PRJ_QUOTA_INO. Cheers, Andreas > (ino >= EXT4_FIRST_INO(sb) && > ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)); > } > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 04c6cc3..4077932 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1036,8 +1036,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); > @@ -1135,7 +1135,8 @@ enum { > Opt_journal_path, 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_barrier, Opt_nobarrier, Opt_err, > Opt_usrquota, Opt_grpquota, Opt_i_version, > @@ -1190,6 +1191,8 @@ static const match_table_t tokens = { > {Opt_usrjquota, "usrjquota=%s"}, > {Opt_offgrpjquota, "grpjquota="}, > {Opt_grpjquota, "grpjquota=%s"}, > + {Opt_prjjquota, "prjjquota"}, > + {Opt_offprjjquota, "offprjjquota"}, > {Opt_jqfmt_vfsold, "jqfmt=vfsold"}, > {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"}, > {Opt_jqfmt_vfsv1, "jqfmt=vfsv1"}, > @@ -1412,11 +1415,16 @@ static const struct mount_opts { > {Opt_grpquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_GRPQUOTA, > MOPT_SET | MOPT_Q}, > {Opt_noquota, (EXT4_MOUNT_QUOTA | EXT4_MOUNT_USRQUOTA | > - EXT4_MOUNT_GRPQUOTA), MOPT_CLEAR | MOPT_Q}, > + EXT4_MOUNT_GRPQUOTA | EXT4_MOUNT_PRJJQUOTA), > + MOPT_CLEAR | MOPT_Q}, > {Opt_usrjquota, 0, MOPT_Q}, > {Opt_grpjquota, 0, MOPT_Q}, > + {Opt_prjjquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_PRJJQUOTA, > + MOPT_SET | MOPT_Q}, > {Opt_offusrjquota, 0, MOPT_Q}, > {Opt_offgrpjquota, 0, MOPT_Q}, > + {Opt_offprjjquota, 0, EXT4_MOUNT_PRJJQUOTA, > + MOPT_CLEAR | MOPT_Q}, > {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT}, > {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT}, > {Opt_jqfmt_vfsv1, QFMT_VFS_V1, MOPT_QFMT}, > @@ -1673,7 +1681,9 @@ static int parse_options(char *options, struct super_block *sb, > "feature is enabled"); > return 0; > } > - if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { > + if (sbi->s_qf_names[USRQUOTA] || > + sbi->s_qf_names[GRPQUOTA] || > + test_opt(sb, PRJJQUOTA)) { > if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA]) > clear_opt(sb, USRQUOTA); > > @@ -3944,7 +3954,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) > sb->s_qcop = &ext4_qctl_sysfile_operations; > else > sb->s_qcop = &ext4_qctl_operations; > - sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP; > + sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ; > #endif > memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid)); > > @@ -5040,6 +5050,46 @@ restore_opts: > return err; > } > > +static int ext4_statfs_project(struct super_block *sb, > + kprojid_t projid, struct kstatfs *buf) > +{ > + struct kqid qid; > + struct dquot *dquot; > + u64 limit; > + u64 curblock; > + > + qid = make_kqid_projid(projid); > + dquot = dqget(sb, qid); > + if (!dquot) > + return -ESRCH; > + spin_lock(&dq_data_lock); > + > + limit = dquot->dq_dqb.dqb_bsoftlimit ? > + dquot->dq_dqb.dqb_bsoftlimit : > + dquot->dq_dqb.dqb_bhardlimit; > + if (limit && buf->f_blocks * buf->f_bsize > limit) { > + curblock = dquot->dq_dqb.dqb_curspace / buf->f_bsize; > + buf->f_blocks = limit / buf->f_bsize; > + buf->f_bfree = buf->f_bavail = > + (buf->f_blocks > curblock) ? > + (buf->f_blocks - curblock) : 0; > + } > + > + limit = dquot->dq_dqb.dqb_isoftlimit ? > + dquot->dq_dqb.dqb_isoftlimit : > + dquot->dq_dqb.dqb_ihardlimit; > + if (limit && buf->f_files > limit) { > + buf->f_files = limit; > + buf->f_ffree = > + (buf->f_files > dquot->dq_dqb.dqb_curinodes) ? > + (buf->f_files - dquot->dq_dqb.dqb_curinodes) : 0; > + } > + > + spin_unlock(&dq_data_lock); > + dqput(dquot); > + return 0; > +} > + > static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) > { > struct super_block *sb = dentry->d_sb; > @@ -5048,6 +5098,7 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) > ext4_fsblk_t overhead = 0, resv_blocks; > u64 fsid; > s64 bfree; > + struct inode *inode = dentry->d_inode; > resv_blocks = EXT4_C2B(sbi, atomic64_read(&sbi->s_resv_clusters)); > > if (!test_opt(sb, MINIX_DF)) > @@ -5072,6 +5123,9 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) > buf->f_fsid.val[0] = fsid & 0xFFFFFFFFUL; > buf->f_fsid.val[1] = (fsid >> 32) & 0xFFFFFFFFUL; > > + if (ext4_test_inode_flag(inode, EXT4_INODE_PROJINHERIT) && > + sb_has_quota_limits_enabled(sb, PRJQUOTA)) > + ext4_statfs_project(sb, EXT4_I(inode)->i_projid, buf); > return 0; > } > > @@ -5152,7 +5206,9 @@ static int ext4_mark_dquot_dirty(struct dquot *dquot) > > /* Are we journaling quotas? */ > if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) || > - sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { > + sbi->s_qf_names[USRQUOTA] || > + sbi->s_qf_names[GRPQUOTA] || > + test_opt(sb, PRJJQUOTA)) { > dquot_mark_dquot_dirty(dquot); > return ext4_write_dquot(dquot); > } else { > @@ -5236,7 +5292,8 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id, > struct inode *qf_inode; > unsigned long qf_inums[EXT4_MAXQUOTAS] = { > le32_to_cpu(EXT4_SB(sb)->s_es->s_usr_quota_inum), > - le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum) > + le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum), > + le32_to_cpu(EXT4_SB(sb)->s_es->s_prj_quota_inum) > }; > > BUG_ON(!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)); > @@ -5264,7 +5321,8 @@ static int ext4_enable_quotas(struct super_block *sb) > int type, err = 0; > unsigned long qf_inums[EXT4_MAXQUOTAS] = { > le32_to_cpu(EXT4_SB(sb)->s_es->s_usr_quota_inum), > - le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum) > + le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum), > + le32_to_cpu(EXT4_SB(sb)->s_es->s_prj_quota_inum) > }; > > sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE; > -- > 1.7.1 > Cheers, Andreas -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 20, 2015 at 3:23 AM, Andreas Dilger <adilger@dilger.ca> wrote: > On Mar 18, 2015, at 1:04 PM, Li Xi <pkuelelixi@gmail.com> wrote: >> >> This patch adds mount options for enabling/disabling project quota >> accounting and enforcement. A new specific inode is also used for >> project quota accounting. >> >> Signed-off-by: Li Xi <lixi@ddn.com> >> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> >> Reviewed-by: Jan Kara <jack@suse.cz> >> --- >> fs/ext4/ext4.h | 9 +++++- >> fs/ext4/super.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++------ >> 2 files changed, 74 insertions(+), 11 deletions(-) >> >> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h >> index 7acb2da..ad650d4 100644 >> --- a/fs/ext4/ext4.h >> +++ b/fs/ext4/ext4.h >> @@ -208,6 +208,7 @@ struct ext4_io_submit { >> #define EXT4_UNDEL_DIR_INO 6 /* Undelete directory inode */ >> #define EXT4_RESIZE_INO 7 /* Reserved group descriptors inode */ >> #define EXT4_JOURNAL_INO 8 /* Journal inode */ >> +#define EXT4_PRJ_QUOTA_INO 11 /* Project quota inode */ > > To me it doesn't make sense to reserve this inode number if we aren't > going to use it for project quota. I think it is just confusing for > developers that incorrectly think this is correct instead of checking > s_prj_quota_inum. Yeah, I agree that this definition is confusing and it is not so useful since it can be replaced by s_prj_quota_inum. I will removing this definition. In my current patches for E2fsprogs, project quota still uses inode number 11. And if project quota feature is enabled, the s_first_ino will be set to s_prj_quota_inum + 1. I hope this is a acceptable implementation. > >> /* First non-reserved inode for old ext4 filesystems */ >> #define EXT4_GOOD_OLD_FIRST_INO 11 >> @@ -987,6 +988,7 @@ struct ext4_inode_info { >> #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */ >> #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ >> #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ >> +#define EXT4_MOUNT_PRJJQUOTA 0x2000000 /* Journaled Project quota */ >> #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ >> #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ >> #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */ >> @@ -1169,7 +1171,8 @@ struct ext4_super_block { >> __le32 s_overhead_clusters; /* overhead blocks/clusters in fs */ >> __le32 s_backup_bgs[2]; /* groups with sparse_super2 SBs */ >> __u8 s_encrypt_algos[4]; /* Encryption algorithms in use */ >> - __le32 s_reserved[105]; /* Padding to the end of the block */ >> + __le32 s_prj_quota_inum; /* inode for tracking project quota */ >> + __le32 s_reserved[104]; /* Padding to the end of the block */ >> __le32 s_checksum; /* crc32c(superblock) */ >> }; >> >> @@ -1184,7 +1187,7 @@ struct ext4_super_block { >> #define EXT4_MF_FS_ABORTED 0x0002 /* Fatal error detected */ >> >> /* Number of quota types we support */ >> -#define EXT4_MAXQUOTAS 2 >> +#define EXT4_MAXQUOTAS 3 >> >> /* >> * fourth extended-fs super-block data in memory >> @@ -1376,6 +1379,8 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) >> ino == EXT4_BOOT_LOADER_INO || >> ino == EXT4_JOURNAL_INO || >> ino == EXT4_RESIZE_INO || >> + (EXT4_FIRST_INO(sb) > EXT4_PRJ_QUOTA_INO && >> + ino == EXT4_PRJ_QUOTA_INO) || > > This check isn't correct either, if s_prj_quota_inum != EXT4_PRJ_QUOTA_INO. > > Cheers, Andreas > >> (ino >= EXT4_FIRST_INO(sb) && >> ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)); >> } >> diff --git a/fs/ext4/super.c b/fs/ext4/super.c >> index 04c6cc3..4077932 100644 >> --- a/fs/ext4/super.c >> +++ b/fs/ext4/super.c >> @@ -1036,8 +1036,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); >> @@ -1135,7 +1135,8 @@ enum { >> Opt_journal_path, 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_barrier, Opt_nobarrier, Opt_err, >> Opt_usrquota, Opt_grpquota, Opt_i_version, >> @@ -1190,6 +1191,8 @@ static const match_table_t tokens = { >> {Opt_usrjquota, "usrjquota=%s"}, >> {Opt_offgrpjquota, "grpjquota="}, >> {Opt_grpjquota, "grpjquota=%s"}, >> + {Opt_prjjquota, "prjjquota"}, >> + {Opt_offprjjquota, "offprjjquota"}, >> {Opt_jqfmt_vfsold, "jqfmt=vfsold"}, >> {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"}, >> {Opt_jqfmt_vfsv1, "jqfmt=vfsv1"}, >> @@ -1412,11 +1415,16 @@ static const struct mount_opts { >> {Opt_grpquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_GRPQUOTA, >> MOPT_SET | MOPT_Q}, >> {Opt_noquota, (EXT4_MOUNT_QUOTA | EXT4_MOUNT_USRQUOTA | >> - EXT4_MOUNT_GRPQUOTA), MOPT_CLEAR | MOPT_Q}, >> + EXT4_MOUNT_GRPQUOTA | EXT4_MOUNT_PRJJQUOTA), >> + MOPT_CLEAR | MOPT_Q}, >> {Opt_usrjquota, 0, MOPT_Q}, >> {Opt_grpjquota, 0, MOPT_Q}, >> + {Opt_prjjquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_PRJJQUOTA, >> + MOPT_SET | MOPT_Q}, >> {Opt_offusrjquota, 0, MOPT_Q}, >> {Opt_offgrpjquota, 0, MOPT_Q}, >> + {Opt_offprjjquota, 0, EXT4_MOUNT_PRJJQUOTA, >> + MOPT_CLEAR | MOPT_Q}, >> {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT}, >> {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT}, >> {Opt_jqfmt_vfsv1, QFMT_VFS_V1, MOPT_QFMT}, >> @@ -1673,7 +1681,9 @@ static int parse_options(char *options, struct super_block *sb, >> "feature is enabled"); >> return 0; >> } >> - if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { >> + if (sbi->s_qf_names[USRQUOTA] || >> + sbi->s_qf_names[GRPQUOTA] || >> + test_opt(sb, PRJJQUOTA)) { >> if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA]) >> clear_opt(sb, USRQUOTA); >> >> @@ -3944,7 +3954,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) >> sb->s_qcop = &ext4_qctl_sysfile_operations; >> else >> sb->s_qcop = &ext4_qctl_operations; >> - sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP; >> + sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ; >> #endif >> memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid)); >> >> @@ -5040,6 +5050,46 @@ restore_opts: >> return err; >> } >> >> +static int ext4_statfs_project(struct super_block *sb, >> + kprojid_t projid, struct kstatfs *buf) >> +{ >> + struct kqid qid; >> + struct dquot *dquot; >> + u64 limit; >> + u64 curblock; >> + >> + qid = make_kqid_projid(projid); >> + dquot = dqget(sb, qid); >> + if (!dquot) >> + return -ESRCH; >> + spin_lock(&dq_data_lock); >> + >> + limit = dquot->dq_dqb.dqb_bsoftlimit ? >> + dquot->dq_dqb.dqb_bsoftlimit : >> + dquot->dq_dqb.dqb_bhardlimit; >> + if (limit && buf->f_blocks * buf->f_bsize > limit) { >> + curblock = dquot->dq_dqb.dqb_curspace / buf->f_bsize; >> + buf->f_blocks = limit / buf->f_bsize; >> + buf->f_bfree = buf->f_bavail = >> + (buf->f_blocks > curblock) ? >> + (buf->f_blocks - curblock) : 0; >> + } >> + >> + limit = dquot->dq_dqb.dqb_isoftlimit ? >> + dquot->dq_dqb.dqb_isoftlimit : >> + dquot->dq_dqb.dqb_ihardlimit; >> + if (limit && buf->f_files > limit) { >> + buf->f_files = limit; >> + buf->f_ffree = >> + (buf->f_files > dquot->dq_dqb.dqb_curinodes) ? >> + (buf->f_files - dquot->dq_dqb.dqb_curinodes) : 0; >> + } >> + >> + spin_unlock(&dq_data_lock); >> + dqput(dquot); >> + return 0; >> +} >> + >> static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) >> { >> struct super_block *sb = dentry->d_sb; >> @@ -5048,6 +5098,7 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) >> ext4_fsblk_t overhead = 0, resv_blocks; >> u64 fsid; >> s64 bfree; >> + struct inode *inode = dentry->d_inode; >> resv_blocks = EXT4_C2B(sbi, atomic64_read(&sbi->s_resv_clusters)); >> >> if (!test_opt(sb, MINIX_DF)) >> @@ -5072,6 +5123,9 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) >> buf->f_fsid.val[0] = fsid & 0xFFFFFFFFUL; >> buf->f_fsid.val[1] = (fsid >> 32) & 0xFFFFFFFFUL; >> >> + if (ext4_test_inode_flag(inode, EXT4_INODE_PROJINHERIT) && >> + sb_has_quota_limits_enabled(sb, PRJQUOTA)) >> + ext4_statfs_project(sb, EXT4_I(inode)->i_projid, buf); >> return 0; >> } >> >> @@ -5152,7 +5206,9 @@ static int ext4_mark_dquot_dirty(struct dquot *dquot) >> >> /* Are we journaling quotas? */ >> if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) || >> - sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { >> + sbi->s_qf_names[USRQUOTA] || >> + sbi->s_qf_names[GRPQUOTA] || >> + test_opt(sb, PRJJQUOTA)) { >> dquot_mark_dquot_dirty(dquot); >> return ext4_write_dquot(dquot); >> } else { >> @@ -5236,7 +5292,8 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id, >> struct inode *qf_inode; >> unsigned long qf_inums[EXT4_MAXQUOTAS] = { >> le32_to_cpu(EXT4_SB(sb)->s_es->s_usr_quota_inum), >> - le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum) >> + le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum), >> + le32_to_cpu(EXT4_SB(sb)->s_es->s_prj_quota_inum) >> }; >> >> BUG_ON(!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)); >> @@ -5264,7 +5321,8 @@ static int ext4_enable_quotas(struct super_block *sb) >> int type, err = 0; >> unsigned long qf_inums[EXT4_MAXQUOTAS] = { >> le32_to_cpu(EXT4_SB(sb)->s_es->s_usr_quota_inum), >> - le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum) >> + le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum), >> + le32_to_cpu(EXT4_SB(sb)->s_es->s_prj_quota_inum) >> }; >> >> sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE; >> -- >> 1.7.1 >> > > > Cheers, Andreas > > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 7acb2da..ad650d4 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -208,6 +208,7 @@ struct ext4_io_submit { #define EXT4_UNDEL_DIR_INO 6 /* Undelete directory inode */ #define EXT4_RESIZE_INO 7 /* Reserved group descriptors inode */ #define EXT4_JOURNAL_INO 8 /* Journal inode */ +#define EXT4_PRJ_QUOTA_INO 11 /* Project quota inode */ /* First non-reserved inode for old ext4 filesystems */ #define EXT4_GOOD_OLD_FIRST_INO 11 @@ -987,6 +988,7 @@ struct ext4_inode_info { #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */ #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ +#define EXT4_MOUNT_PRJJQUOTA 0x2000000 /* Journaled Project quota */ #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */ @@ -1169,7 +1171,8 @@ struct ext4_super_block { __le32 s_overhead_clusters; /* overhead blocks/clusters in fs */ __le32 s_backup_bgs[2]; /* groups with sparse_super2 SBs */ __u8 s_encrypt_algos[4]; /* Encryption algorithms in use */ - __le32 s_reserved[105]; /* Padding to the end of the block */ + __le32 s_prj_quota_inum; /* inode for tracking project quota */ + __le32 s_reserved[104]; /* Padding to the end of the block */ __le32 s_checksum; /* crc32c(superblock) */ }; @@ -1184,7 +1187,7 @@ struct ext4_super_block { #define EXT4_MF_FS_ABORTED 0x0002 /* Fatal error detected */ /* Number of quota types we support */ -#define EXT4_MAXQUOTAS 2 +#define EXT4_MAXQUOTAS 3 /* * fourth extended-fs super-block data in memory @@ -1376,6 +1379,8 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) ino == EXT4_BOOT_LOADER_INO || ino == EXT4_JOURNAL_INO || ino == EXT4_RESIZE_INO || + (EXT4_FIRST_INO(sb) > EXT4_PRJ_QUOTA_INO && + ino == EXT4_PRJ_QUOTA_INO) || (ino >= EXT4_FIRST_INO(sb) && ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)); } diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 04c6cc3..4077932 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1036,8 +1036,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); @@ -1135,7 +1135,8 @@ enum { Opt_journal_path, 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_barrier, Opt_nobarrier, Opt_err, Opt_usrquota, Opt_grpquota, Opt_i_version, @@ -1190,6 +1191,8 @@ static const match_table_t tokens = { {Opt_usrjquota, "usrjquota=%s"}, {Opt_offgrpjquota, "grpjquota="}, {Opt_grpjquota, "grpjquota=%s"}, + {Opt_prjjquota, "prjjquota"}, + {Opt_offprjjquota, "offprjjquota"}, {Opt_jqfmt_vfsold, "jqfmt=vfsold"}, {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"}, {Opt_jqfmt_vfsv1, "jqfmt=vfsv1"}, @@ -1412,11 +1415,16 @@ static const struct mount_opts { {Opt_grpquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_GRPQUOTA, MOPT_SET | MOPT_Q}, {Opt_noquota, (EXT4_MOUNT_QUOTA | EXT4_MOUNT_USRQUOTA | - EXT4_MOUNT_GRPQUOTA), MOPT_CLEAR | MOPT_Q}, + EXT4_MOUNT_GRPQUOTA | EXT4_MOUNT_PRJJQUOTA), + MOPT_CLEAR | MOPT_Q}, {Opt_usrjquota, 0, MOPT_Q}, {Opt_grpjquota, 0, MOPT_Q}, + {Opt_prjjquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_PRJJQUOTA, + MOPT_SET | MOPT_Q}, {Opt_offusrjquota, 0, MOPT_Q}, {Opt_offgrpjquota, 0, MOPT_Q}, + {Opt_offprjjquota, 0, EXT4_MOUNT_PRJJQUOTA, + MOPT_CLEAR | MOPT_Q}, {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT}, {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT}, {Opt_jqfmt_vfsv1, QFMT_VFS_V1, MOPT_QFMT}, @@ -1673,7 +1681,9 @@ static int parse_options(char *options, struct super_block *sb, "feature is enabled"); return 0; } - if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { + if (sbi->s_qf_names[USRQUOTA] || + sbi->s_qf_names[GRPQUOTA] || + test_opt(sb, PRJJQUOTA)) { if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA]) clear_opt(sb, USRQUOTA); @@ -3944,7 +3954,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sb->s_qcop = &ext4_qctl_sysfile_operations; else sb->s_qcop = &ext4_qctl_operations; - sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP; + sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ; #endif memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid)); @@ -5040,6 +5050,46 @@ restore_opts: return err; } +static int ext4_statfs_project(struct super_block *sb, + kprojid_t projid, struct kstatfs *buf) +{ + struct kqid qid; + struct dquot *dquot; + u64 limit; + u64 curblock; + + qid = make_kqid_projid(projid); + dquot = dqget(sb, qid); + if (!dquot) + return -ESRCH; + spin_lock(&dq_data_lock); + + limit = dquot->dq_dqb.dqb_bsoftlimit ? + dquot->dq_dqb.dqb_bsoftlimit : + dquot->dq_dqb.dqb_bhardlimit; + if (limit && buf->f_blocks * buf->f_bsize > limit) { + curblock = dquot->dq_dqb.dqb_curspace / buf->f_bsize; + buf->f_blocks = limit / buf->f_bsize; + buf->f_bfree = buf->f_bavail = + (buf->f_blocks > curblock) ? + (buf->f_blocks - curblock) : 0; + } + + limit = dquot->dq_dqb.dqb_isoftlimit ? + dquot->dq_dqb.dqb_isoftlimit : + dquot->dq_dqb.dqb_ihardlimit; + if (limit && buf->f_files > limit) { + buf->f_files = limit; + buf->f_ffree = + (buf->f_files > dquot->dq_dqb.dqb_curinodes) ? + (buf->f_files - dquot->dq_dqb.dqb_curinodes) : 0; + } + + spin_unlock(&dq_data_lock); + dqput(dquot); + return 0; +} + static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) { struct super_block *sb = dentry->d_sb; @@ -5048,6 +5098,7 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) ext4_fsblk_t overhead = 0, resv_blocks; u64 fsid; s64 bfree; + struct inode *inode = dentry->d_inode; resv_blocks = EXT4_C2B(sbi, atomic64_read(&sbi->s_resv_clusters)); if (!test_opt(sb, MINIX_DF)) @@ -5072,6 +5123,9 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_fsid.val[0] = fsid & 0xFFFFFFFFUL; buf->f_fsid.val[1] = (fsid >> 32) & 0xFFFFFFFFUL; + if (ext4_test_inode_flag(inode, EXT4_INODE_PROJINHERIT) && + sb_has_quota_limits_enabled(sb, PRJQUOTA)) + ext4_statfs_project(sb, EXT4_I(inode)->i_projid, buf); return 0; } @@ -5152,7 +5206,9 @@ static int ext4_mark_dquot_dirty(struct dquot *dquot) /* Are we journaling quotas? */ if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) || - sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { + sbi->s_qf_names[USRQUOTA] || + sbi->s_qf_names[GRPQUOTA] || + test_opt(sb, PRJJQUOTA)) { dquot_mark_dquot_dirty(dquot); return ext4_write_dquot(dquot); } else { @@ -5236,7 +5292,8 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id, struct inode *qf_inode; unsigned long qf_inums[EXT4_MAXQUOTAS] = { le32_to_cpu(EXT4_SB(sb)->s_es->s_usr_quota_inum), - le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum) + le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum), + le32_to_cpu(EXT4_SB(sb)->s_es->s_prj_quota_inum) }; BUG_ON(!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)); @@ -5264,7 +5321,8 @@ static int ext4_enable_quotas(struct super_block *sb) int type, err = 0; unsigned long qf_inums[EXT4_MAXQUOTAS] = { le32_to_cpu(EXT4_SB(sb)->s_es->s_usr_quota_inum), - le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum) + le32_to_cpu(EXT4_SB(sb)->s_es->s_grp_quota_inum), + le32_to_cpu(EXT4_SB(sb)->s_es->s_prj_quota_inum) }; sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE;