From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: xiakaixu1987@gmail.com
Cc: linux-xfs@vger.kernel.org, Kaixu Xia <kaixuxia@tencent.com>
Subject: Re: [PATCH v4 1/3] xfs: delete duplicated tp->t_dqinfo null check and allocation
Date: Mon, 26 Oct 2020 15:51:03 -0700 [thread overview]
Message-ID: <20201026225103.GD347246@magnolia> (raw)
In-Reply-To: <1602130749-23093-2-git-send-email-kaixuxia@tencent.com>
On Thu, Oct 08, 2020 at 12:19:07PM +0800, xiakaixu1987@gmail.com wrote:
> From: Kaixu Xia <kaixuxia@tencent.com>
>
> The function xfs_trans_mod_dquot_byino() wrap around xfs_trans_mod_dquot()
> to account for quotas, and also there is the function call chain
> xfs_trans_reserve_quota_bydquots -> xfs_trans_dqresv -> xfs_trans_mod_dquot,
> both of them do the duplicated null check and allocation. Thus
> we can delete the duplicated operation from them.
>
> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
Looks good to me,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_trans_dquot.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
> index fe45b0c3970c..67f1e275b34d 100644
> --- a/fs/xfs/xfs_trans_dquot.c
> +++ b/fs/xfs/xfs_trans_dquot.c
> @@ -143,9 +143,6 @@ xfs_trans_mod_dquot_byino(
> xfs_is_quota_inode(&mp->m_sb, ip->i_ino))
> return;
>
> - if (tp->t_dqinfo == NULL)
> - xfs_trans_alloc_dqinfo(tp);
> -
> if (XFS_IS_UQUOTA_ON(mp) && ip->i_udquot)
> (void) xfs_trans_mod_dquot(tp, ip->i_udquot, field, delta);
> if (XFS_IS_GQUOTA_ON(mp) && ip->i_gdquot)
> @@ -698,7 +695,6 @@ xfs_trans_dqresv(
> * because we don't have the luxury of a transaction envelope then.
> */
> if (tp) {
> - ASSERT(tp->t_dqinfo);
> ASSERT(flags & XFS_QMOPT_RESBLK_MASK);
> if (nblks != 0)
> xfs_trans_mod_dquot(tp, dqp,
> @@ -752,9 +748,6 @@ xfs_trans_reserve_quota_bydquots(
> if (!XFS_IS_QUOTA_RUNNING(mp) || !XFS_IS_QUOTA_ON(mp))
> return 0;
>
> - if (tp && tp->t_dqinfo == NULL)
> - xfs_trans_alloc_dqinfo(tp);
> -
> ASSERT(flags & XFS_QMOPT_RESBLK_MASK);
>
> if (udqp) {
> --
> 2.20.0
>
next prev parent reply other threads:[~2020-10-26 22:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 4:19 [PATCH v4 0/3] xfs: random fixes for disk quota xiakaixu1987
2020-10-08 4:19 ` [PATCH v4 1/3] xfs: delete duplicated tp->t_dqinfo null check and allocation xiakaixu1987
2020-10-09 11:32 ` Brian Foster
2020-10-26 22:51 ` Darrick J. Wong [this message]
2020-10-08 4:19 ` [PATCH v4 2/3] xfs: check tp->t_dqinfo value instead of the XFS_TRANS_DQ_DIRTY flag xiakaixu1987
2020-10-09 11:32 ` Brian Foster
2020-10-26 22:51 ` Darrick J. Wong
2020-10-08 4:19 ` [PATCH v4 3/3] xfs: directly return if the delta equal to zero xiakaixu1987
2020-10-09 11:32 ` Brian Foster
2020-10-10 1:50 ` kaixuxia
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=20201026225103.GD347246@magnolia \
--to=darrick.wong@oracle.com \
--cc=kaixuxia@tencent.com \
--cc=linux-xfs@vger.kernel.org \
--cc=xiakaixu1987@gmail.com \
/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).