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 146DFC43457 for ; Mon, 19 Oct 2020 09:53:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B44022224D for ; Mon, 19 Oct 2020 09:53:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727496AbgJSJxa (ORCPT ); Mon, 19 Oct 2020 05:53:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:35470 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727088AbgJSJxa (ORCPT ); Mon, 19 Oct 2020 05:53:30 -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 BAD3EB23C; Mon, 19 Oct 2020 09:53:28 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 88D871E1340; Mon, 19 Oct 2020 11:53:28 +0200 (CEST) Date: Mon, 19 Oct 2020 11:53:28 +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 v2 1/2] ext4: add helpers for checking whether quota can be enabled/is journalled Message-ID: <20201019095328.GE30825@quack2.suse.cz> References: <1602986547-15886-1-git-send-email-dotdot@yandex-team.ru> <20201019093706.GC30825@quack2.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201019093706.GC30825@quack2.suse.cz> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Mon 19-10-20 11:37:06, Jan Kara wrote: > On Sun 18-10-20 05:02:26, Roman Anufriev wrote: > > Right now, there are several places, where we check whether fs is > > capable of enabling quota or if quota is journalled with quite long > > and non-self-descriptive condition statements. > > > > This patch wraps these statements into helpers for better readability > > and easier usage. > > > > Signed-off-by: Roman Anufriev > > Looks good to me. You can add: > > Reviewe-by: Jan Kara Now I've realized that if we run in nojournal mode, quota won't be journalled in any case. Probably not a configuration you run in but still we should get that right. Honza > > --- > > Changes in v2: > > - Fix misleading helper name 'ext4_any_quota_enabled()' -> > > 'ext4_quota_capable()'. > > > > fs/ext4/ext4.h | 15 +++++++++++++++ > > fs/ext4/ext4_jbd2.h | 9 +++------ > > fs/ext4/super.c | 5 +---- > > 3 files changed, 19 insertions(+), 10 deletions(-) > > > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > > index 250e905..897df24 100644 > > --- a/fs/ext4/ext4.h > > +++ b/fs/ext4/ext4.h > > @@ -3251,6 +3251,21 @@ static inline void ext4_unlock_group(struct super_block *sb, > > spin_unlock(ext4_group_lock_ptr(sb, group)); > > } > > > > +#ifdef CONFIG_QUOTA > > +static inline bool ext4_quota_capable(struct super_block *sb) > > +{ > > + return (test_opt(sb, QUOTA) || ext4_has_feature_quota(sb)); > > +} > > + > > +static inline bool ext4_is_quota_journalled(struct super_block *sb) > > +{ > > + struct ext4_sb_info *sbi = EXT4_SB(sb); > > + > > + return (ext4_has_feature_quota(sb) || > > + sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]); > > +} > > +#endif > > + > > /* > > * Block validity checking > > */ > > diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h > > index 00dc668..a124c68 100644 > > --- a/fs/ext4/ext4_jbd2.h > > +++ b/fs/ext4/ext4_jbd2.h > > @@ -86,17 +86,14 @@ > > #ifdef CONFIG_QUOTA > > /* Amount of blocks needed for quota update - we know that the structure was > > * allocated so we need to update only data block */ > > -#define EXT4_QUOTA_TRANS_BLOCKS(sb) ((test_opt(sb, QUOTA) ||\ > > - ext4_has_feature_quota(sb)) ? 1 : 0) > > +#define EXT4_QUOTA_TRANS_BLOCKS(sb) ((ext4_quota_capable(sb)) ? 1 : 0) > > /* Amount of blocks needed for quota insert/delete - we do some block writes > > * but inode, sb and group updates are done only once */ > > -#define EXT4_QUOTA_INIT_BLOCKS(sb) ((test_opt(sb, QUOTA) ||\ > > - ext4_has_feature_quota(sb)) ?\ > > +#define EXT4_QUOTA_INIT_BLOCKS(sb) ((ext4_quota_capable(sb)) ?\ > > (DQUOT_INIT_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\ > > +3+DQUOT_INIT_REWRITE) : 0) > > > > -#define EXT4_QUOTA_DEL_BLOCKS(sb) ((test_opt(sb, QUOTA) ||\ > > - ext4_has_feature_quota(sb)) ?\ > > +#define EXT4_QUOTA_DEL_BLOCKS(sb) ((ext4_quota_capable(sb)) ?\ > > (DQUOT_DEL_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\ > > +3+DQUOT_DEL_REWRITE) : 0) > > #else > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > > index 9d01318..a988cf3 100644 > > --- a/fs/ext4/super.c > > +++ b/fs/ext4/super.c > > @@ -6158,11 +6158,8 @@ static int ext4_release_dquot(struct dquot *dquot) > > static int ext4_mark_dquot_dirty(struct dquot *dquot) > > { > > struct super_block *sb = dquot->dq_sb; > > - struct ext4_sb_info *sbi = EXT4_SB(sb); > > > > - /* Are we journaling quotas? */ > > - if (ext4_has_feature_quota(sb) || > > - sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { > > + if (ext4_is_quota_journalled(sb)) { > > dquot_mark_dquot_dirty(dquot); > > return ext4_write_dquot(dquot); > > } else { > > -- > > 2.7.4 > > > -- > Jan Kara > SUSE Labs, CR -- Jan Kara SUSE Labs, CR