mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
xfs: refactor reflink functions to use xfs_trans_alloc_inode
The two remaining callers of xfs_trans_reserve_quota_nblks are in the reflink code. These conversions aren't as uniform as the previous conversions, so call that out in a separate patch. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
3de4eb106f
commit
f273387b04
2 changed files with 23 additions and 33 deletions
|
@ -831,7 +831,8 @@ xfs_direct_write_iomap_begin(
|
|||
return xfs_bmbt_to_iomap(ip, iomap, &cmap, IOMAP_F_SHARED);
|
||||
|
||||
out_unlock:
|
||||
xfs_iunlock(ip, lockmode);
|
||||
if (lockmode)
|
||||
xfs_iunlock(ip, lockmode);
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
|
@ -376,16 +376,14 @@ xfs_reflink_allocate_cow(
|
|||
resblks = XFS_DIOSTRAT_SPACE_RES(mp, resaligned);
|
||||
|
||||
xfs_iunlock(ip, *lockmode);
|
||||
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, 0, &tp);
|
||||
*lockmode = XFS_ILOCK_EXCL;
|
||||
xfs_ilock(ip, *lockmode);
|
||||
*lockmode = 0;
|
||||
|
||||
error = xfs_trans_alloc_inode(ip, &M_RES(mp)->tr_write, resblks, 0,
|
||||
false, &tp);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
error = xfs_qm_dqattach_locked(ip, false);
|
||||
if (error)
|
||||
goto out_trans_cancel;
|
||||
*lockmode = XFS_ILOCK_EXCL;
|
||||
|
||||
/*
|
||||
* Check for an overlapping extent again now that we dropped the ilock.
|
||||
|
@ -398,12 +396,6 @@ xfs_reflink_allocate_cow(
|
|||
goto convert;
|
||||
}
|
||||
|
||||
error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0, false);
|
||||
if (error)
|
||||
goto out_trans_cancel;
|
||||
|
||||
xfs_trans_ijoin(tp, ip, 0);
|
||||
|
||||
/* Allocate the entire reservation as unwritten blocks. */
|
||||
nimaps = 1;
|
||||
error = xfs_bmapi_write(tp, ip, imap->br_startoff, imap->br_blockcount,
|
||||
|
@ -997,7 +989,7 @@ xfs_reflink_remap_extent(
|
|||
struct xfs_mount *mp = ip->i_mount;
|
||||
struct xfs_trans *tp;
|
||||
xfs_off_t newlen;
|
||||
int64_t qres, qdelta;
|
||||
int64_t qdelta = 0;
|
||||
unsigned int resblks;
|
||||
bool smap_real;
|
||||
bool dmap_written = xfs_bmap_is_written_extent(dmap);
|
||||
|
@ -1005,15 +997,22 @@ xfs_reflink_remap_extent(
|
|||
int nimaps;
|
||||
int error;
|
||||
|
||||
/* Start a rolling transaction to switch the mappings */
|
||||
/*
|
||||
* Start a rolling transaction to switch the mappings.
|
||||
*
|
||||
* Adding a written extent to the extent map can cause a bmbt split,
|
||||
* and removing a mapped extent from the extent can cause a bmbt split.
|
||||
* The two operations cannot both cause a split since they operate on
|
||||
* the same index in the bmap btree, so we only need a reservation for
|
||||
* one bmbt split if either thing is happening. However, we haven't
|
||||
* locked the inode yet, so we reserve assuming this is the case.
|
||||
*/
|
||||
resblks = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);
|
||||
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, 0, &tp);
|
||||
error = xfs_trans_alloc_inode(ip, &M_RES(mp)->tr_write, resblks, 0,
|
||||
false, &tp);
|
||||
if (error)
|
||||
goto out;
|
||||
|
||||
xfs_ilock(ip, XFS_ILOCK_EXCL);
|
||||
xfs_trans_ijoin(tp, ip, 0);
|
||||
|
||||
/*
|
||||
* Read what's currently mapped in the destination file into smap.
|
||||
* If smap isn't a hole, we will have to remove it before we can add
|
||||
|
@ -1061,15 +1060,9 @@ xfs_reflink_remap_extent(
|
|||
}
|
||||
|
||||
/*
|
||||
* Compute quota reservation if we think the quota block counter for
|
||||
* Increase quota reservation if we think the quota block counter for
|
||||
* this file could increase.
|
||||
*
|
||||
* Adding a written extent to the extent map can cause a bmbt split,
|
||||
* and removing a mapped extent from the extent can cause a bmbt split.
|
||||
* The two operations cannot both cause a split since they operate on
|
||||
* the same index in the bmap btree, so we only need a reservation for
|
||||
* one bmbt split if either thing is happening.
|
||||
*
|
||||
* If we are mapping a written extent into the file, we need to have
|
||||
* enough quota block count reservation to handle the blocks in that
|
||||
* extent. We log only the delta to the quota block counts, so if the
|
||||
|
@ -1083,13 +1076,9 @@ xfs_reflink_remap_extent(
|
|||
* before we started. That should have removed all the delalloc
|
||||
* reservations, but we code defensively.
|
||||
*/
|
||||
qres = qdelta = 0;
|
||||
if (smap_real || dmap_written)
|
||||
qres = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);
|
||||
if (!smap_real && dmap_written)
|
||||
qres += dmap->br_blockcount;
|
||||
if (qres > 0) {
|
||||
error = xfs_trans_reserve_quota_nblks(tp, ip, qres, 0, false);
|
||||
if (!smap_real && dmap_written) {
|
||||
error = xfs_trans_reserve_quota_nblks(tp, ip,
|
||||
dmap->br_blockcount, 0, false);
|
||||
if (error)
|
||||
goto out_cancel;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue