@@ -325,24 +325,23 @@ xfs_reflink_reserve_cow(
/* Convert part of an unwritten CoW extent to a real one. */
STATIC int
-__xfs_reflink_convert_cow(
+xfs_reflink_convert_cow_extent(
struct xfs_inode *ip,
struct xfs_bmbt_irec *imap,
xfs_fileoff_t offset_fsb,
xfs_filblks_t count_fsb,
struct xfs_defer_ops *dfops)
{
- struct xfs_bmbt_irec irec = *imap;
xfs_fsblock_t first_block;
int nimaps = 1;
- xfs_trim_extent(&irec, offset_fsb, count_fsb);
- trace_xfs_reflink_convert_cow(ip, &irec);
- if (irec.br_blockcount == 0)
+ xfs_trim_extent(imap, offset_fsb, count_fsb);
+ trace_xfs_reflink_convert_cow(ip, imap);
+ if (imap->br_blockcount == 0)
return 0;
- return xfs_bmapi_write(NULL, ip, irec.br_startoff, irec.br_blockcount,
+ return xfs_bmapi_write(NULL, ip, imap->br_startoff, imap->br_blockcount,
XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT, &first_block,
- 0, &irec, &nimaps, dfops);
+ 0, imap, &nimaps, dfops);
}
/* Convert all of the unwritten CoW extents in a file's range to real ones. */
@@ -372,7 +371,7 @@ xfs_reflink_convert_cow(
found = xfs_iext_get_extent(ifp, ++idx, &got)) {
if (got.br_state == XFS_EXT_NORM)
continue;
- error = __xfs_reflink_convert_cow(ip, &got, offset_fsb,
+ error = xfs_reflink_convert_cow_extent(ip, &got, offset_fsb,
end_fsb - offset_fsb, &dfops);
if (error)
break;
We'll need it for the direct I/O code. Also rename the function to xfs_reflink_convert_cow_extent to describe it a bit better. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_reflink.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)