On Sat, Jan 23, 2021 at 10:51:40AM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@xxxxxxxxxx> > > Convert a few xfs_trans_*reserve* callsites that are open-coding other > convenience functions. > > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> > Reviewed-by: Christoph Hellwig <hch@xxxxxx> > --- Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> > 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; >
