On Sun 18-10-20 05:02:27, Roman Anufriev wrote:
> Right now, it is hard to understand what quota journalling type is enabled:
> you need to be quite familiar with kernel code and trace it or really
> understand what different combinations of fs flags/mount options lead to.
>
> This patch adds printing of current quota jounalling mode on each
> mount/remount, thus making it easier to check it at a glance/in autotests.
> The semantics is similar to ext4 data journalling modes:
>
> * journalled - quota accounting and journaling are enabled
> * writeback - quota accounting is enabled, but journalling is disabled
The above two descriptions are still somewhat misleading - in fact we don't
know whether accounting is enabled or not. Just *if* it is enabled, quota
will be journalled / non-journalled. So I'd probably describe it like:
* journalled - quota configured, journalling will be enabled
* writeback - quota configured, journalling will be disabled
We've talked with Ted on last ext4 conf call and we agreed that it's
probably time to deprecate old style quotas in external quota files and
transition everybody to using quotas with quota feature. That way things
will get simpler again. But before we can disable that functionality, it
will take a few years of deprecation warnings etc. so that's not directly
related to your patch here. JFYI.
Honza
> * none - quota accounting is disabled
> * disabled - kernel compiled without CONFIG_QUOTA feature
>
> Signed-off-by: Roman Anufriev <dotdot@xxxxxxxxxxxxxx>
> ---
> Changes in v2:
> - Print quota journalling mode instead of exporting it via sysfs.
>
> fs/ext4/super.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index a988cf3..09b5645 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -3985,6 +3985,21 @@ static void ext4_set_resv_clusters(struct super_block *sb)
> atomic64_set(&sbi->s_resv_clusters, resv_clusters);
> }
>
> +static const char *ext4_quota_mode(struct super_block *sb)
> +{
> +#ifdef CONFIG_QUOTA
> + if (!ext4_quota_capable(sb))
> + return "none";
> +
> + if (ext4_is_quota_journalled(sb))
> + return "journalled";
> + else
> + return "writeback";
> +#else
> + return "disabled"
> +#endif
> +}
> +
> static int ext4_fill_super(struct super_block *sb, void *data, int silent)
> {
> struct dax_device *dax_dev = fs_dax_get_by_bdev(sb->s_bdev);
> @@ -5039,10 +5054,11 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
>
> if (___ratelimit(&ext4_mount_msg_ratelimit, "EXT4-fs mount"))
> ext4_msg(sb, KERN_INFO, "mounted filesystem with%s. "
> - "Opts: %.*s%s%s", descr,
> + "Opts: %.*s%s%s. Quota mode: %s.", descr,
> (int) sizeof(sbi->s_es->s_mount_opts),
> sbi->s_es->s_mount_opts,
> - *sbi->s_es->s_mount_opts ? "; " : "", orig_data);
> + *sbi->s_es->s_mount_opts ? "; " : "", orig_data,
> + ext4_quota_mode(sb));
>
> if (es->s_error_count)
> mod_timer(&sbi->s_err_report, jiffies + 300*HZ); /* 5 minutes */
> @@ -5979,7 +5995,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
> */
> *flags = (*flags & ~vfs_flags) | (sb->s_flags & vfs_flags);
>
> - ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
> + ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s. Quota mode: %s.",
> + orig_data, ext4_quota_mode(sb));
> kfree(orig_data);
> return 0;
>
> --
> 2.7.4
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
