diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2021-01-15 14:15:44 -0800 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2021-01-15 17:40:29 -0800 |
| commit | 82cd493e2396b5c5269e297063b9851edd0e485b (patch) | |
| tree | acfb4509b14013be947118f6c6e06edd90c3c736 | |
| parent | c236c3e781f78e6c7e972222361f4ee59ee06e7c (diff) | |
| download | xfs-linux-82cd493e2396b5c5269e297063b9851edd0e485b.tar.gz | |
xfs: create convenience wrappers for quota reservations
Notice: this object is not reachable from any branch.
Create a couple of convenience wrappers for creating and deleting quota
reservations.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Notice: this object is not reachable from any branch.
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 8 | ||||
| -rw-r--r-- | fs/xfs/xfs_quota.h | 19 | ||||
| -rw-r--r-- | 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 21076ac2485a3..fa6b442eb75fb 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 @@ out_unreserve_blocks: 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 bd28d17941e70..b1411d25c9e5d 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 20321d03e31ce..1f3270ffaea50 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; |