On 7/7/16 2:09 AM, Wang Shilong wrote:
> From: Wang Shilong <wshilong@xxxxxxx>
>
> add prjquota, prjjquota, offprjjquota mount options
> for project quota.
>
> These kind of mount options are used for old
> quota design, and we can use quotas like these
> way:
>
> # mkfs.ext4 /dev/sda
> # mount /dev/sda -o prjquota /mnt/test
> # quotacheck -p /mnt/test
> # quotaon /mnt/test
>
> This new mount options are also useful to unify
> some generic tests for xfs and ext4.
Thanks, I definitely think this makes sense for symmetry, at least.
The new mount options should also be documented in
Documentation/filesystems/ext4.txt as well as the ext4(5) manpage
in e2fsprogs.
But speaking of documentation, is the whole "old vs new" quota
behavior well-documented somewhere? I'm afraid I've lost the
thread on all that. mount -o usrquota vs. mount -o usrjquota
vs tune2fs vs mkfs vs. oh my! ;)
> Signed-off-by: Wang Shilong <wshilong@xxxxxxx>
> ---
> fs/ext4/ext4.h | 1 +
> fs/ext4/ialloc.c | 4 ++--
> fs/ext4/inode.c | 7 ++-----
> fs/ext4/ioctl.c | 6 ++++--
> fs/ext4/super.c | 43 +++++++++++++++++++++++++++++++++----------
> 5 files changed, 42 insertions(+), 19 deletions(-)
>
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index b84aa1c..315838a 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -1129,6 +1129,7 @@ struct ext4_inode_info {
> #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
> #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
> #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
> +#define EXT4_MOUNT_PRJQUOTA 0x40000 /* "old" project quota */
> #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
> #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
> #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
> diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
> index 3da4cf8..f7209fc 100644
> --- a/fs/ext4/ialloc.c
> +++ b/fs/ext4/ialloc.c
> @@ -802,8 +802,8 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
> } else
> inode_init_owner(inode, dir, mode);
>
> - if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_PROJECT) &&
> - ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT))
> + if ((EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_PROJECT) ||
> + test_opt(sb, PRJQUOTA)) && ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT))
> ei->i_projid = EXT4_I(dir)->i_projid;
> else
> ei->i_projid = make_kprojid(&init_user_ns, EXT4_DEF_PROJID);
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index f7140ca..c407f9b 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -4385,7 +4385,8 @@ static inline void ext4_iget_extra_inode(struct inode *inode,
>
> int ext4_get_projid(struct inode *inode, kprojid_t *projid)
> {
> - if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb, EXT4_FEATURE_RO_COMPAT_PROJECT))
> + if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb, EXT4_FEATURE_RO_COMPAT_PROJECT)
> + && !test_opt(inode->i_sb, PRJQUOTA))
I wonder if this should be encapsulated in an ext4_prjquota_enabled() or something;
not that big of a deal but it gets repeated a few times, now.
> return -EOPNOTSUPP;
> *projid = EXT4_I(inode)->i_projid;
> return 0;
> @@ -4856,10 +4857,6 @@ static int ext4_do_update_inode(handle_t *handle,
> }
> }
>
> - BUG_ON(!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
> - EXT4_FEATURE_RO_COMPAT_PROJECT) &&
> - i_projid != EXT4_DEF_PROJID);
> -
Why was this removed vs. adding the mount option test?
> if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE &&
> EXT4_FITS_IN_INODE(raw_inode, ei, i_projid))
> raw_inode->i_projid = cpu_to_le32(i_projid);
> diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> index b5a39b0..6062a81 100644
> --- a/fs/ext4/ioctl.c
> +++ b/fs/ext4/ioctl.c
> @@ -311,7 +311,8 @@ static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
> struct dquot *transfer_to[MAXQUOTAS] = { };
>
> if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
> - EXT4_FEATURE_RO_COMPAT_PROJECT)) {
> + EXT4_FEATURE_RO_COMPAT_PROJECT) &&
> + !test_opt(sb, PRJQUOTA)) {
> if (projid != EXT4_DEF_PROJID)
> return -EOPNOTSUPP;
> else
> @@ -849,7 +850,8 @@ encryption_policy_out:
> fa.fsx_xflags = ext4_iflags_to_xflags(ei->i_flags & EXT4_FL_USER_VISIBLE);
>
> if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
> - EXT4_FEATURE_RO_COMPAT_PROJECT)) {
> + EXT4_FEATURE_RO_COMPAT_PROJECT) ||
> + test_opt(inode->i_sb, PRJQUOTA)) {
> fa.fsx_projid = (__u32)from_kprojid(&init_user_ns,
> EXT4_I(inode)->i_projid);
> }
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 3822a5a..93a776f 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -1184,10 +1184,10 @@ 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_test_dummy_encryption,
> - Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
> - 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, Opt_dax,
> + 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,
small whitespace damage at the beginning of that line.
> + Opt_err, Opt_usrquota, Opt_grpquota, Opt_prjquota, Opt_i_version, Opt_dax,
> Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
> Opt_lazytime, Opt_nolazytime,
> Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
> @@ -1240,6 +1240,8 @@ static const match_table_t tokens = {
> {Opt_usrjquota, "usrjquota=%s"},
> {Opt_offgrpjquota, "grpjquota="},
> {Opt_grpjquota, "grpjquota=%s"},
> + {Opt_prjjquota, "prjjquota=%s"},
> + {Opt_offprjjquota, "prjjquota="},
> {Opt_jqfmt_vfsold, "jqfmt=vfsold"},
> {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"},
> {Opt_jqfmt_vfsv1, "jqfmt=vfsv1"},
> @@ -1250,6 +1252,7 @@ static const match_table_t tokens = {
> {Opt_barrier, "barrier=%u"},
> {Opt_barrier, "barrier"},
> {Opt_nobarrier, "nobarrier"},
> + {Opt_prjquota, "prjquota"},
> {Opt_i_version, "i_version"},
> {Opt_dax, "dax"},
> {Opt_stripe, "stripe=%u"},
> @@ -1466,12 +1469,17 @@ static const struct mount_opts {
> MOPT_SET | MOPT_Q},
> {Opt_grpquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_GRPQUOTA,
> MOPT_SET | MOPT_Q},
> + {Opt_prjquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_PRJQUOTA,
> + MOPT_SET | MOPT_Q},
> {Opt_noquota, (EXT4_MOUNT_QUOTA | EXT4_MOUNT_USRQUOTA |
> - EXT4_MOUNT_GRPQUOTA), MOPT_CLEAR | MOPT_Q},
> + EXT4_MOUNT_GRPQUOTA | EXT4_MOUNT_PRJQUOTA),
> + MOPT_CLEAR | MOPT_Q},
> {Opt_usrjquota, 0, MOPT_Q},
> {Opt_grpjquota, 0, MOPT_Q},
> + {Opt_prjjquota, 0, MOPT_Q},
> {Opt_offusrjquota, 0, MOPT_Q},
> {Opt_offgrpjquota, 0, MOPT_Q},
> + {Opt_offprjjquota, 0, 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},
> @@ -1495,10 +1503,14 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
> return set_qf_name(sb, USRQUOTA, &args[0]);
> else if (token == Opt_grpjquota)
> return set_qf_name(sb, GRPQUOTA, &args[0]);
> + else if (token == Opt_prjjquota)
> + return set_qf_name(sb, PRJQUOTA, &args[0]);
> else if (token == Opt_offusrjquota)
> return clear_qf_name(sb, USRQUOTA);
> else if (token == Opt_offgrpjquota)
> return clear_qf_name(sb, GRPQUOTA);
> + else if (token == Opt_offprjjquota)
> + return clear_qf_name(sb, PRJQUOTA);
> #endif
> switch (token) {
> case Opt_noacl:
> @@ -1757,19 +1769,26 @@ static int parse_options(char *options, struct super_block *sb,
> }
> #ifdef CONFIG_QUOTA
> if (ext4_has_feature_quota(sb) &&
> - (test_opt(sb, USRQUOTA) || test_opt(sb, GRPQUOTA))) {
> - ext4_msg(sb, KERN_INFO, "Quota feature enabled, usrquota and grpquota "
> + (test_opt(sb, USRQUOTA) || test_opt(sb, GRPQUOTA) ||
> + test_opt(sb, PRJQUOTA))) {
> + ext4_msg(sb, KERN_INFO, "Quota feature enabled, usrquota,grpquota,prjquota "
> "mount options ignored.");
> clear_opt(sb, USRQUOTA);
> clear_opt(sb, GRPQUOTA);
> - } else if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {
> + clear_opt(sb, PRJQUOTA);
> + } else 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(sb, USRQUOTA);
>
> if (test_opt(sb, GRPQUOTA) && sbi->s_qf_names[GRPQUOTA])
> clear_opt(sb, GRPQUOTA);
>
> - if (test_opt(sb, GRPQUOTA) || test_opt(sb, USRQUOTA)) {
> + if (test_opt(sb, PRJQUOTA) && sbi->s_qf_names[PRJQUOTA])
> + clear_opt(sb, GRPQUOTA);
> +
> + 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;
> @@ -1829,6 +1848,9 @@ static inline void ext4_show_quota_options(struct seq_file *seq,
>
> if (sbi->s_qf_names[GRPQUOTA])
> seq_show_option(seq, "grpjquota", sbi->s_qf_names[GRPQUOTA]);
> +
> + if (sbi->s_qf_names[PRJQUOTA])
> + seq_show_option(seq, "prjjquota", sbi->s_qf_names[PRJQUOTA]);
> #endif
> }
>
> @@ -4992,7 +5014,8 @@ static int ext4_mark_dquot_dirty(struct dquot *dquot)
>
> /* Are we journaling quotas? */
> if (ext4_has_feature_quota(sb) ||
> - sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {
> + sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA] ||
> + sbi->s_qf_names[PRJQUOTA]) {
> dquot_mark_dquot_dirty(dquot);
> return ext4_write_dquot(dquot);
> } else {
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
