xfs: remove bmap insert/collapse firstblock param

Source kernel commit: 333f950c89a17018f812eae13daaa2a404c413c1

The only callers pass ->t_firstblock.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 200a252186049adbfc575d03a8195e3a2ebd3b29..10e1cda7515795f87d55367fee36c5c712c3c8c3 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -5643,8 +5643,7 @@ xfs_bmap_collapse_extents(
        struct xfs_inode        *ip,
        xfs_fileoff_t           *next_fsb,
        xfs_fileoff_t           offset_shift_fsb,
-       bool                    *done,
-       xfs_fsblock_t           *firstblock)
+       bool                    *done)
 {
        int                     whichfork = XFS_DATA_FORK;
        struct xfs_mount        *mp = ip->i_mount;
@@ -5677,7 +5676,7 @@ xfs_bmap_collapse_extents(
 
        if (ifp->if_flags & XFS_IFBROOT) {
                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;
        }
 
@@ -5764,8 +5763,7 @@ xfs_bmap_insert_extents(
        xfs_fileoff_t           *next_fsb,
        xfs_fileoff_t           offset_shift_fsb,
        bool                    *done,
-       xfs_fileoff_t           stop_fsb,
-       xfs_fsblock_t           *firstblock)
+       xfs_fileoff_t           stop_fsb)
 {
        int                     whichfork = XFS_DATA_FORK;
        struct xfs_mount        *mp = ip->i_mount;
@@ -5798,7 +5796,7 @@ xfs_bmap_insert_extents(
 
        if (ifp->if_flags & XFS_IFBROOT) {
                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;
        }
 

diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h
index 108a3073d6589cdb1c5e47e3c8a7c14ba058816c..3cad9c3e3bdaf9b46dd057863d9550d0a2354aae 100644 (file)
--- a/libxfs/xfs_bmap.h
+++ b/libxfs/xfs_bmap.h
@@ -217,12 +217,12 @@ void      xfs_bmap_del_extent_cow(struct xfs_inode *ip,
 uint   xfs_default_attroffset(struct xfs_inode *ip);
 int    xfs_bmap_collapse_extents(struct xfs_trans *tp, struct xfs_inode *ip,
                xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,
-               bool *done, xfs_fsblock_t *firstblock);
+               bool *done);
 int    xfs_bmap_can_insert_extents(struct xfs_inode *ip, xfs_fileoff_t off,
                xfs_fileoff_t shift);
 int    xfs_bmap_insert_extents(struct xfs_trans *tp, struct xfs_inode *ip,
                xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,
-               bool *done, xfs_fileoff_t stop_fsb, xfs_fsblock_t *firstblock);
+               bool *done, xfs_fileoff_t stop_fsb);
 int    xfs_bmap_split_extent(struct xfs_inode *ip, xfs_fileoff_t split_offset);
 int    xfs_bmapi_reserve_delalloc(struct xfs_inode *ip, int whichfork,
                xfs_fileoff_t off, xfs_filblks_t len, xfs_filblks_t prealloc,