From: Jan Kara <jack@suse.cz>
To: Roman Anufriev <dotdot@yandex-team.ru>
Cc: linux-ext4@vger.kernel.org, tytso@mit.edu, jack@suse.cz,
dmtrmonakhov@yandex-team.ru
Subject: Re: [PATCH 1/2] ext4: add helpers for checking whether quota is enabled/journalled
Date: Thu, 15 Oct 2020 14:24:26 +0200 [thread overview]
Message-ID: <20201015122426.GE7037@quack2.suse.cz> (raw)
In-Reply-To: <1602761572-4713-1-git-send-email-dotdot@yandex-team.ru>
On Thu 15-10-20 14:32:51, Roman Anufriev wrote:
> Right now, there are several places, where we check whether quota
> is enabled or journalled with quite long and non-self-descriptive
> condition statements.
>
> This patch wraps these statements into helpers (with naming along
> with existing ones like sb_has_quota_loaded) for better readability
> and easier usage.
>
> Signed-off-by: Roman Anufriev <dotdot@yandex-team.ru>
> Reviewed-by: Dmitry Monakhov <dmtrmonakhov@yandex-team.ru>
Looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> 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..217ae7b 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_any_quota_enabled(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..4a4eb3f 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_any_quota_enabled(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_any_quota_enabled(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_any_quota_enabled(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 <jack@suse.com>
SUSE Labs, CR
prev parent reply other threads:[~2020-10-15 12:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 11:32 [PATCH 1/2] ext4: add helpers for checking whether quota is enabled/journalled Roman Anufriev
2020-10-15 11:32 ` [PATCH 2/2] ext4: export quota journalling mode via sysfs attr quota_mode Roman Anufriev
2020-10-15 13:15 ` Jan Kara
2020-10-17 18:26 ` Roman Anufriev
2020-10-19 8:19 ` Jan Kara
2020-10-19 9:36 ` Roman Anufriev
2020-10-15 12:24 ` Jan Kara [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201015122426.GE7037@quack2.suse.cz \
--to=jack@suse.cz \
--cc=dmtrmonakhov@yandex-team.ru \
--cc=dotdot@yandex-team.ru \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).