From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>,
linux-xfs@vger.kernel.org, hch@infradead.org,
david@fromorbit.com
Subject: Re: [PATCH 1/4] xfs: clean up quota reservation callsites
Date: Mon, 25 Jan 2021 10:13:44 -0500 [thread overview]
Message-ID: <20210125151344.GC2047559@bfoster> (raw)
In-Reply-To: <161142790077.2170981.3836953907583983452.stgit@magnolia>
On Sat, Jan 23, 2021 at 10:51:40AM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Convert a few xfs_trans_*reserve* callsites that are open-coding other
> convenience functions.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_bmap.c | 3 +--
> fs/xfs/xfs_bmap_util.c | 4 ++--
> fs/xfs/xfs_reflink.c | 4 ++--
> 3 files changed, 5 insertions(+), 6 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 2cd24bb06040..aea179212946 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4938,8 +4938,7 @@ xfs_bmap_del_extent_delay(
> * sb counters as we might have to borrow some blocks for the
> * indirect block accounting.
> */
> - error = xfs_trans_reserve_quota_nblks(NULL, ip,
> - -((long)del->br_blockcount), 0,
> + error = xfs_trans_unreserve_quota_nblks(NULL, ip, del->br_blockcount, 0,
> isrt ? XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS);
> if (error)
> return error;
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index f3f8c48ff5bf..792809debaaa 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -884,8 +884,8 @@ xfs_unmap_extent(
> }
>
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> - error = xfs_trans_reserve_quota(tp, mp, ip->i_udquot, ip->i_gdquot,
> - ip->i_pdquot, resblks, 0, XFS_QMOPT_RES_REGBLKS);
> + error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0,
> + XFS_QMOPT_RES_REGBLKS);
> if (error)
> goto out_trans_cancel;
>
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index e1c98dbf79e4..183142fd0961 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -508,8 +508,8 @@ xfs_reflink_cancel_cow_blocks(
> xfs_bmap_del_extent_cow(ip, &icur, &got, &del);
>
> /* Remove the quota reservation */
> - error = xfs_trans_reserve_quota_nblks(NULL, ip,
> - -(long)del.br_blockcount, 0,
> + error = xfs_trans_unreserve_quota_nblks(NULL, ip,
> + del.br_blockcount, 0,
> XFS_QMOPT_RES_REGBLKS);
> if (error)
> break;
>
next prev parent reply other threads:[~2021-01-26 5:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-23 18:51 [PATCHSET v2 0/4] xfs: minor cleanups of the quota functions Darrick J. Wong
2021-01-23 18:51 ` [PATCH 1/4] xfs: clean up quota reservation callsites Darrick J. Wong
2021-01-25 15:13 ` Brian Foster [this message]
2021-01-23 18:51 ` [PATCH 2/4] xfs: clean up quota reservation wrappers Darrick J. Wong
2021-01-25 15:13 ` Brian Foster
2021-01-23 18:51 ` [PATCH 3/4] xfs: create convenience wrappers for incore quota block reservations Darrick J. Wong
2021-01-24 9:33 ` Christoph Hellwig
2021-01-25 15:15 ` Brian Foster
2021-01-26 20:37 ` Darrick J. Wong
2021-01-23 18:51 ` [PATCH 4/4] xfs: clean up icreate quota reservation calls Darrick J. Wong
2021-01-25 15:17 ` Brian Foster
2021-01-26 18:23 ` Darrick J. Wong
2021-01-26 4:51 ` [PATCH 5/4] xfs: fix up build warnings when quotas are disabled Darrick J. Wong
2021-01-27 16:58 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2021-01-18 22:11 [PATCHSET 0/4] xfs: minor cleanups of the quota functions Darrick J. Wong
2021-01-18 22:11 ` [PATCH 1/4] xfs: clean up quota reservation callsites Darrick J. Wong
2021-01-19 6:35 ` Christoph Hellwig
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=20210125151344.GC2047559@bfoster \
--to=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/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).