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 3/3] xfs: only do dqget or dqhold for the specified dquots
Date: Tue, 22 Sep 2020 09:18:43 -0700 [thread overview]
Message-ID: <20200922161843.GH7955@magnolia> (raw)
In-Reply-To: <1600765442-12146-4-git-send-email-kaixuxia@tencent.com>
On Tue, Sep 22, 2020 at 05:04:02PM +0800, xiakaixu1987@gmail.com wrote:
> From: Kaixu Xia <kaixuxia@tencent.com>
>
> We attach the dquot(s) to the given inode and return udquot, gdquot
> or pdquot with references taken by dqget or dqhold in xfs_qm_vop_dqalloc()
> funciton. Actually, we only need to do dqget or dqhold for the specified
> dquots, it is unnecessary if the passed-in O_{u,g,p}dqpp value is NULL.
When would a caller pass in (for example) XFS_QMOPT_UQUOTA, a different
uid than the one currently associated with the inode, but a null
O_udqpp? It doesn't make sense to say "Prepare to change this file's
uid, but don't give me the dquot of the new uid."
None of the callers do that today, so I don't see the point of this
patch. Perhaps the function could ASSERT the arguments a little more
closely?
--D
> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
> ---
> fs/xfs/xfs_qm.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index 44509decb4cd..38380fc29b4d 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -1661,7 +1661,7 @@ xfs_qm_vop_dqalloc(
> }
> }
>
> - if ((flags & XFS_QMOPT_UQUOTA) && XFS_IS_UQUOTA_ON(mp)) {
> + if ((flags & XFS_QMOPT_UQUOTA) && XFS_IS_UQUOTA_ON(mp) && O_udqpp) {
> if (!uid_eq(inode->i_uid, uid)) {
> /*
> * What we need is the dquot that has this uid, and
> @@ -1694,7 +1694,7 @@ xfs_qm_vop_dqalloc(
> uq = xfs_qm_dqhold(ip->i_udquot);
> }
> }
> - if ((flags & XFS_QMOPT_GQUOTA) && XFS_IS_GQUOTA_ON(mp)) {
> + if ((flags & XFS_QMOPT_GQUOTA) && XFS_IS_GQUOTA_ON(mp) && O_gdqpp) {
> if (!gid_eq(inode->i_gid, gid)) {
> xfs_iunlock(ip, lockflags);
> error = xfs_qm_dqget(mp, from_kgid(user_ns, gid),
> @@ -1711,7 +1711,7 @@ xfs_qm_vop_dqalloc(
> gq = xfs_qm_dqhold(ip->i_gdquot);
> }
> }
> - if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) {
> + if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp) && O_pdqpp) {
> if (ip->i_d.di_projid != prid) {
> xfs_iunlock(ip, lockflags);
> error = xfs_qm_dqget(mp, prid,
> @@ -1733,16 +1733,11 @@ xfs_qm_vop_dqalloc(
> xfs_iunlock(ip, lockflags);
> if (O_udqpp)
> *O_udqpp = uq;
> - else
> - xfs_qm_dqrele(uq);
> if (O_gdqpp)
> *O_gdqpp = gq;
> - else
> - xfs_qm_dqrele(gq);
> if (O_pdqpp)
> *O_pdqpp = pq;
> - else
> - xfs_qm_dqrele(pq);
> +
> return 0;
>
> error_rele:
> --
> 2.20.0
>
next prev parent reply other threads:[~2020-09-22 16:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 9:03 [RFC PATCH 0/3]xfs: random fixes for disk quota xiakaixu1987
2020-09-22 9:04 ` [PATCH 1/3] xfs: directly return if the delta equal to zero xiakaixu1987
2020-09-22 16:19 ` Darrick J. Wong
2020-09-22 17:43 ` Brian Foster
2020-09-23 2:42 ` kaixuxia
2020-09-23 13:27 ` Brian Foster
2020-09-23 16:09 ` Darrick J. Wong
2020-09-23 7:01 ` Christoph Hellwig
2020-09-22 9:04 ` [PATCH 2/3] xfs: remove the unused parameter id from xfs_qm_dqattach_one xiakaixu1987
2020-09-22 16:20 ` Darrick J. Wong
2020-09-23 7:02 ` Christoph Hellwig
2020-09-22 9:04 ` [PATCH 3/3] xfs: only do dqget or dqhold for the specified dquots xiakaixu1987
2020-09-22 16:18 ` Darrick J. Wong [this message]
2020-09-23 3:11 ` kaixuxia
2020-09-23 16:30 ` [RFC PATCH 0/3]xfs: random fixes for disk quota Darrick J. Wong
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=20200922161843.GH7955@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