Commit 1e5ae199 authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong

xfs: use internal dfops in cow blocks cancel

All callers either explicitly initialize a dfops or pass a
transaction with an internal dfops. Drop the hacky old dfops
replacement logic and use the one associated with the transaction.
Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarBill O'Donnell <billodo@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent e021a2e5
...@@ -483,8 +483,6 @@ xfs_reflink_cancel_cow_blocks( ...@@ -483,8 +483,6 @@ xfs_reflink_cancel_cow_blocks(
struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK); struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
struct xfs_bmbt_irec got, del; struct xfs_bmbt_irec got, del;
struct xfs_iext_cursor icur; struct xfs_iext_cursor icur;
struct xfs_defer_ops dfops;
struct xfs_defer_ops *odfops = (*tpp)->t_dfops;
int error = 0; int error = 0;
if (!xfs_is_reflink_inode(ip)) if (!xfs_is_reflink_inode(ip))
...@@ -511,7 +509,8 @@ xfs_reflink_cancel_cow_blocks( ...@@ -511,7 +509,8 @@ xfs_reflink_cancel_cow_blocks(
if (error) if (error)
break; break;
} else if (del.br_state == XFS_EXT_UNWRITTEN || cancel_real) { } else if (del.br_state == XFS_EXT_UNWRITTEN || cancel_real) {
xfs_defer_init(*tpp, &dfops); ASSERT((*tpp)->t_dfops);
ASSERT((*tpp)->t_firstblock == NULLFSBLOCK);
/* Free the CoW orphan record. */ /* Free the CoW orphan record. */
error = xfs_refcount_free_cow_extent(ip->i_mount, error = xfs_refcount_free_cow_extent(ip->i_mount,
...@@ -553,7 +552,6 @@ xfs_reflink_cancel_cow_blocks( ...@@ -553,7 +552,6 @@ xfs_reflink_cancel_cow_blocks(
/* clear tag if cow fork is emptied */ /* clear tag if cow fork is emptied */
if (!ifp->if_bytes) if (!ifp->if_bytes)
xfs_inode_clear_cowblocks_tag(ip); xfs_inode_clear_cowblocks_tag(ip);
(*tpp)->t_dfops = odfops;
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment