Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 333f950c authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

xfs: remove bmap insert/collapse firstblock param 



The only callers pass ->t_firstblock.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 2af52842

fs/xfs/libxfs/xfs_bmap.c

+4 −6
Original line number Diff line number Diff line
@@ -5652,8 +5652,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;
@@ -5686,7 +5685,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;

	}
@@ -5773,8 +5772,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;
@@ -5807,7 +5805,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;

	}

fs/xfs/libxfs/xfs_bmap.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

fs/xfs/xfs_bmap_util.c

+2 −2
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ xfs_collapse_file_space( 


		xfs_defer_init(tp, &dfops, &tp->t_firstblock);

		error = xfs_bmap_collapse_extents(tp, ip, &next_fsb, shift_fsb,

				&done, &tp->t_firstblock);

				&done);

		if (error)

			goto out_bmap_cancel;
@@ -1421,7 +1421,7 @@ xfs_insert_file_space( 
		xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

		xfs_defer_init(tp, &dfops, &tp->t_firstblock);

		error = xfs_bmap_insert_extents(tp, ip, &next_fsb, shift_fsb,

				&done, stop_fsb, &tp->t_firstblock);

				&done, stop_fsb);

		if (error)

			goto out_bmap_cancel;