From dcf9585a7511147c7ffd580be8580dd39bc52fb6 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 6 Feb 2017 10:46:01 -0800 Subject: xfs: return the converted extent in __xfs_reflink_convert_cow 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 Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong --- fs/xfs/xfs_reflink.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 8c8c4f4676da..219bc96bfc71 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -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. */ -- cgit v1.2.3