|
@@ -5652,8 +5652,7 @@ xfs_bmap_collapse_extents(
|
|
struct xfs_inode *ip,
|
|
struct xfs_inode *ip,
|
|
xfs_fileoff_t *next_fsb,
|
|
xfs_fileoff_t *next_fsb,
|
|
xfs_fileoff_t offset_shift_fsb,
|
|
xfs_fileoff_t offset_shift_fsb,
|
|
- bool *done,
|
|
|
|
- xfs_fsblock_t *firstblock)
|
|
|
|
|
|
+ bool *done)
|
|
{
|
|
{
|
|
int whichfork = XFS_DATA_FORK;
|
|
int whichfork = XFS_DATA_FORK;
|
|
struct xfs_mount *mp = ip->i_mount;
|
|
struct xfs_mount *mp = ip->i_mount;
|
|
@@ -5686,7 +5685,7 @@ xfs_bmap_collapse_extents(
|
|
|
|
|
|
if (ifp->if_flags & XFS_IFBROOT) {
|
|
if (ifp->if_flags & XFS_IFBROOT) {
|
|
cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
|
|
cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
|
|
- cur->bc_private.b.firstblock = *firstblock;
|
|
|
|
|
|
+ cur->bc_private.b.firstblock = tp->t_firstblock;
|
|
cur->bc_private.b.flags = 0;
|
|
cur->bc_private.b.flags = 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -5773,8 +5772,7 @@ xfs_bmap_insert_extents(
|
|
xfs_fileoff_t *next_fsb,
|
|
xfs_fileoff_t *next_fsb,
|
|
xfs_fileoff_t offset_shift_fsb,
|
|
xfs_fileoff_t offset_shift_fsb,
|
|
bool *done,
|
|
bool *done,
|
|
- xfs_fileoff_t stop_fsb,
|
|
|
|
- xfs_fsblock_t *firstblock)
|
|
|
|
|
|
+ xfs_fileoff_t stop_fsb)
|
|
{
|
|
{
|
|
int whichfork = XFS_DATA_FORK;
|
|
int whichfork = XFS_DATA_FORK;
|
|
struct xfs_mount *mp = ip->i_mount;
|
|
struct xfs_mount *mp = ip->i_mount;
|
|
@@ -5807,7 +5805,7 @@ xfs_bmap_insert_extents(
|
|
|
|
|
|
if (ifp->if_flags & XFS_IFBROOT) {
|
|
if (ifp->if_flags & XFS_IFBROOT) {
|
|
cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
|
|
cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
|
|
- cur->bc_private.b.firstblock = *firstblock;
|
|
|
|
|
|
+ cur->bc_private.b.firstblock = tp->t_firstblock;
|
|
cur->bc_private.b.flags = 0;
|
|
cur->bc_private.b.flags = 0;
|
|
}
|
|
}
|
|
|
|
|