leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: clean up quota reservation callsites

Browse Source 
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>
This commit is contained in:
Darrick J. Wong 2021-01-22 16:48:33 -08:00
parent b8055ed677
commit 4abe21ad67
3 changed files with 5 additions and 6 deletions

3
fs/xfs/libxfs/xfs_bmap.c
View File

@ -4937,8 +4937,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;

4
fs/xfs/xfs_bmap_util.c
View File

@ -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;

4
fs/xfs/xfs_reflink.c
View File

@ -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;