Skip to content

Commit

Permalink
xfs: return the converted extent in __xfs_reflink_convert_cow
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
  • Loading branch information
Christoph Hellwig authored and Darrick J. Wong committed Feb 7, 2017
1 parent f13eb20 commit dcf9585
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions fs/xfs/xfs_reflink.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,20 +332,19 @@ xfs_reflink_convert_cow_extent(
xfs_filblks_t count_fsb,
struct xfs_defer_ops *dfops)
{
struct xfs_bmbt_irec irec = *imap;
xfs_fsblock_t first_block;
int nimaps = 1;

if (imap->br_state == XFS_EXT_NORM)
return 0;

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. */
Expand Down

0 comments on commit dcf9585

Please sign in to comment.