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 v2 1/4] xfs: do the ASSERT for the arguments O_{u,g,p}dqpp
Date: Mon, 5 Oct 2020 21:35:25 -0700 [thread overview]
Message-ID: <20201006043525.GT49547@magnolia> (raw)
In-Reply-To: <1601126073-32453-2-git-send-email-kaixuxia@tencent.com>
On Sat, Sep 26, 2020 at 09:14:30PM +0800, xiakaixu1987@gmail.com wrote:
> From: Kaixu Xia <kaixuxia@tencent.com>
>
> If we pass in XFS_QMOPT_{U,G,P}QUOTA flags and different uid/gid/prid
> than them currently associated with the inode, the arguments
> O_{u,g,p}dqpp shouldn't be NULL, so add the ASSERT for them.
>
> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
Ok, seems fine to me...
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_qm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index 44509decb4cd..b2a9abee8b2b 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -1662,6 +1662,7 @@ xfs_qm_vop_dqalloc(
> }
>
> if ((flags & XFS_QMOPT_UQUOTA) && XFS_IS_UQUOTA_ON(mp)) {
> + ASSERT(O_udqpp);
> if (!uid_eq(inode->i_uid, uid)) {
> /*
> * What we need is the dquot that has this uid, and
> @@ -1695,6 +1696,7 @@ xfs_qm_vop_dqalloc(
> }
> }
> if ((flags & XFS_QMOPT_GQUOTA) && XFS_IS_GQUOTA_ON(mp)) {
> + ASSERT(O_gdqpp);
> if (!gid_eq(inode->i_gid, gid)) {
> xfs_iunlock(ip, lockflags);
> error = xfs_qm_dqget(mp, from_kgid(user_ns, gid),
> @@ -1712,6 +1714,7 @@ xfs_qm_vop_dqalloc(
> }
> }
> if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) {
> + ASSERT(O_pdqpp);
> if (ip->i_d.di_projid != prid) {
> xfs_iunlock(ip, lockflags);
> error = xfs_qm_dqget(mp, prid,
> --
> 2.20.0
>
next prev parent reply other threads:[~2020-10-06 4:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-26 13:14 [PATCH v2 0/4] xfs: random fixes for disk quota xiakaixu1987
2020-09-26 13:14 ` [PATCH v2 1/4] xfs: do the ASSERT for the arguments O_{u,g,p}dqpp xiakaixu1987
2020-10-06 4:35 ` Darrick J. Wong [this message]
2020-09-26 13:14 ` [PATCH v2 2/4] xfs: fix the indent in xfs_trans_mod_dquot xiakaixu1987
2020-10-06 4:36 ` Darrick J. Wong
2020-09-26 13:14 ` [PATCH v2 3/4] xfs: check tp->t_dqinfo value instead of the XFS_TRANS_DQ_DIRTY flag xiakaixu1987
2020-09-26 15:36 ` Eric Sandeen
2020-10-02 3:31 ` kaixuxia
2020-10-06 4:42 ` Darrick J. Wong
2020-10-06 11:33 ` kaixuxia
2020-09-26 13:14 ` [PATCH v2 4/4] xfs: directly return if the delta equal to zero xiakaixu1987
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=20201006043525.GT49547@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