From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 3/4] xfs: create convenience wrappers for incore quota block reservations
Date: Mon, 18 Jan 2021 14:11:50 -0800 [thread overview]
Message-ID: <161100791039.88678.6897577495997060048.stgit@magnolia> (raw)
In-Reply-To: <161100789347.88678.17195697099723545426.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Create a couple of convenience wrappers for creating and deleting quota
block reservations against future changes.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/libxfs/xfs_bmap.c | 8 +++-----
fs/xfs/xfs_quota.h | 19 +++++++++++++++++++
fs/xfs/xfs_reflink.c | 3 +--
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 21076ac2485a..fa6b442eb75f 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4001,8 +4001,7 @@ xfs_bmapi_reserve_delalloc(
* blocks. This number gets adjusted later. We return if we haven't
* allocated blocks already inside this loop.
*/
- error = xfs_trans_reserve_quota_nblks(NULL, ip, (long)alen, 0,
- XFS_QMOPT_RES_REGBLKS);
+ error = xfs_quota_reserve_blkres(ip, alen, XFS_QMOPT_RES_REGBLKS);
if (error)
return error;
@@ -4048,8 +4047,7 @@ xfs_bmapi_reserve_delalloc(
xfs_mod_fdblocks(mp, alen, false);
out_unreserve_quota:
if (XFS_IS_QUOTA_ON(mp))
- xfs_trans_unreserve_quota_nblks(NULL, ip, (long)alen, 0,
- XFS_QMOPT_RES_REGBLKS);
+ xfs_quota_unreserve_blkres(ip, alen, XFS_QMOPT_RES_REGBLKS);
return error;
}
@@ -4826,7 +4824,7 @@ xfs_bmap_del_extent_delay(
* sb counters as we might have to borrow some blocks for the
* indirect block accounting.
*/
- error = xfs_trans_unreserve_quota_nblks(NULL, ip, del->br_blockcount, 0,
+ error = xfs_quota_unreserve_blkres(ip, del->br_blockcount,
isrt ? XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS);
if (error)
return error;
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index bd28d17941e7..b1411d25c9e5 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -136,6 +136,11 @@ static inline int xfs_trans_reserve_quota_bydquots(struct xfs_trans *tp,
{
return 0;
}
+static inline int xfs_quota_reserve_blkres(struct xfs_inode *ip,
+ int64_t nblks, unsigned int flags)
+{
+ return 0;
+}
#define xfs_qm_vop_create_dqattach(tp, ip, u, g, p)
#define xfs_qm_vop_rename_dqattach(it) (0)
#define xfs_qm_vop_chown(tp, ip, old, new) (NULL)
@@ -162,6 +167,20 @@ xfs_trans_unreserve_quota_nblks(struct xfs_trans *tp, struct xfs_inode *ip,
xfs_trans_reserve_quota_bydquots(tp, mp, ud, gd, pd, nb, ni, \
f | XFS_QMOPT_RES_REGBLKS)
+static inline int
+xfs_quota_reserve_blkres(struct xfs_inode *ip, int64_t nblks,
+ unsigned int flags)
+{
+ return xfs_trans_reserve_quota_nblks(NULL, ip, nblks, 0, flags);
+}
+
+static inline int
+xfs_quota_unreserve_blkres(struct xfs_inode *ip, int64_t nblks,
+ unsigned int flags)
+{
+ return xfs_quota_reserve_blkres(ip, -nblks, flags);
+}
+
extern int xfs_mount_reset_sbqflags(struct xfs_mount *);
#endif /* __XFS_QUOTA_H__ */
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 20321d03e31c..1f3270ffaea5 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -508,8 +508,7 @@ xfs_reflink_cancel_cow_blocks(
xfs_bmap_del_extent_cow(ip, &icur, &got, &del);
/* Remove the quota reservation */
- error = xfs_trans_unreserve_quota_nblks(NULL, ip,
- del.br_blockcount, 0,
+ error = xfs_quota_unreserve_blkres(ip, del.br_blockcount,
XFS_QMOPT_RES_REGBLKS);
if (error)
break;
next prev parent reply other threads:[~2021-01-18 22:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2021-01-18 22:11 ` [PATCH 2/4] xfs: clean up quota reservation wrappers Darrick J. Wong
2021-01-19 6:38 ` Christoph Hellwig
2021-01-18 22:11 ` Darrick J. Wong [this message]
2021-01-19 6:44 ` [PATCH 3/4] xfs: create convenience wrappers for incore quota block reservations Christoph Hellwig
2021-01-19 19:47 ` Darrick J. Wong
2021-01-19 20:26 ` Darrick J. Wong
2021-01-20 4:33 ` [PATCH v2.1 " Darrick J. Wong
2021-01-18 22:11 ` [PATCH 4/4] xfs: clean up icreate quota reservation calls Darrick J. Wong
2021-01-19 6:46 ` Christoph Hellwig
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 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
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=161100791039.88678.6897577495997060048.stgit@magnolia \
--to=djwong@kernel.org \
--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).