From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4108DC4363A for ; Fri, 23 Oct 2020 15:48:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E80BF22254 for ; Fri, 23 Oct 2020 15:48:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S463661AbgJWPsF (ORCPT ); Fri, 23 Oct 2020 11:48:05 -0400 Received: from mx2.suse.de ([195.135.220.15]:59478 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S463613AbgJWPsF (ORCPT ); Fri, 23 Oct 2020 11:48:05 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 40331AB95; Fri, 23 Oct 2020 15:48:04 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 18B7F1E1348; Fri, 23 Oct 2020 17:48:04 +0200 (CEST) Date: Fri, 23 Oct 2020 17:48:04 +0200 From: Jan Kara To: Roman Anufriev Cc: linux-ext4@vger.kernel.org, tytso@mit.edu, jack@suse.cz, dmtrmonakhov@yandex-team.ru Subject: Re: [PATCH v4 2/2] ext4: print quota journalling mode on (re-)mount Message-ID: <20201023154804.GD9119@quack2.suse.cz> References: <1603336860-16153-1-git-send-email-dotdot@yandex-team.ru> <1603336860-16153-2-git-send-email-dotdot@yandex-team.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1603336860-16153-2-git-send-email-dotdot@yandex-team.ru> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Thu 22-10-20 06:21:00, Roman Anufriev wrote: > Right now, it is hard to understand which 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 configured, journalling will be enabled > * writeback - quota configured, journalling won't be enabled > * none - quota isn't configured > * disabled - kernel compiled without CONFIG_QUOTA feature > > Signed-off-by: Roman Anufriev Looks good to me. You can add: Reviewed-by: Jan Kara Honza > --- > 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..f2ddba4 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_SB(sb)->s_journal && 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 SUSE Labs, CR