|
@@ -314,7 +314,6 @@ xfs_reflink_convert_cow_extent(
|
|
xfs_fileoff_t offset_fsb,
|
|
xfs_fileoff_t offset_fsb,
|
|
xfs_filblks_t count_fsb)
|
|
xfs_filblks_t count_fsb)
|
|
{
|
|
{
|
|
- xfs_fsblock_t first_block = NULLFSBLOCK;
|
|
|
|
int nimaps = 1;
|
|
int nimaps = 1;
|
|
|
|
|
|
if (imap->br_state == XFS_EXT_NORM)
|
|
if (imap->br_state == XFS_EXT_NORM)
|
|
@@ -325,8 +324,8 @@ xfs_reflink_convert_cow_extent(
|
|
if (imap->br_blockcount == 0)
|
|
if (imap->br_blockcount == 0)
|
|
return 0;
|
|
return 0;
|
|
return xfs_bmapi_write(NULL, ip, imap->br_startoff, imap->br_blockcount,
|
|
return xfs_bmapi_write(NULL, ip, imap->br_startoff, imap->br_blockcount,
|
|
- XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT, &first_block,
|
|
|
|
- 0, imap, &nimaps);
|
|
|
|
|
|
+ XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT, NULL, 0, imap,
|
|
|
|
+ &nimaps);
|
|
}
|
|
}
|
|
|
|
|
|
/* Convert all of the unwritten CoW extents in a file's range to real ones. */
|
|
/* Convert all of the unwritten CoW extents in a file's range to real ones. */
|
|
@@ -341,7 +340,6 @@ xfs_reflink_convert_cow(
|
|
xfs_fileoff_t end_fsb = XFS_B_TO_FSB(mp, offset + count);
|
|
xfs_fileoff_t end_fsb = XFS_B_TO_FSB(mp, offset + count);
|
|
xfs_filblks_t count_fsb = end_fsb - offset_fsb;
|
|
xfs_filblks_t count_fsb = end_fsb - offset_fsb;
|
|
struct xfs_bmbt_irec imap;
|
|
struct xfs_bmbt_irec imap;
|
|
- xfs_fsblock_t first_block = NULLFSBLOCK;
|
|
|
|
int nimaps = 1, error = 0;
|
|
int nimaps = 1, error = 0;
|
|
|
|
|
|
ASSERT(count != 0);
|
|
ASSERT(count != 0);
|
|
@@ -349,8 +347,7 @@ xfs_reflink_convert_cow(
|
|
xfs_ilock(ip, XFS_ILOCK_EXCL);
|
|
xfs_ilock(ip, XFS_ILOCK_EXCL);
|
|
error = xfs_bmapi_write(NULL, ip, offset_fsb, count_fsb,
|
|
error = xfs_bmapi_write(NULL, ip, offset_fsb, count_fsb,
|
|
XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT |
|
|
XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT |
|
|
- XFS_BMAPI_CONVERT_ONLY, &first_block, 0, &imap,
|
|
|
|
- &nimaps);
|
|
|
|
|
|
+ XFS_BMAPI_CONVERT_ONLY, NULL, 0, &imap, &nimaps);
|
|
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
|
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|