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

Commit 7fb2cd4d authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: remove unused tp arg from xfs_bmap_last_offset() and callers 



remove unused transaction pointer from various
callchains leading to xfs_bmap_last_offset().

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent c9eaa447

fs/xfs/xfs_bmap.c

+0 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,6 @@ xfs_bmap_isaeof( 
 */

int

xfs_bmap_last_offset(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip,

	xfs_fileoff_t		*last_block,

	int			whichfork)

fs/xfs/xfs_bmap.h

+2 −2
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ int xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip, 
		xfs_extlen_t len, xfs_fileoff_t *unused, int whichfork);

int	xfs_bmap_last_before(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t *last_block, int whichfork);

int	xfs_bmap_last_offset(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t *unused, int whichfork);

int	xfs_bmap_last_offset(struct xfs_inode *ip, xfs_fileoff_t *unused,

		int whichfork);

int	xfs_bmap_one_block(struct xfs_inode *ip, int whichfork);

int	xfs_bmap_read_extents(struct xfs_trans *tp, struct xfs_inode *ip,

		int whichfork);

fs/xfs/xfs_dir2.c

+12 −14
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ xfs_dir_createname( 
		goto out_free;

	}



	rval = xfs_dir2_isblock(tp, dp, &v);

	rval = xfs_dir2_isblock(dp, &v);

	if (rval)

		goto out_free;

	if (v) {
@@ -252,7 +252,7 @@ xfs_dir_createname( 
		goto out_free;

	}



	rval = xfs_dir2_isleaf(tp, dp, &v);

	rval = xfs_dir2_isleaf(dp, &v);

	if (rval)

		goto out_free;

	if (v)
@@ -336,7 +336,7 @@ xfs_dir_lookup( 
		goto out_check_rval;

	}



	rval = xfs_dir2_isblock(tp, dp, &v);

	rval = xfs_dir2_isblock(dp, &v);

	if (rval)

		goto out_free;

	if (v) {
@@ -344,7 +344,7 @@ xfs_dir_lookup( 
		goto out_check_rval;

	}



	rval = xfs_dir2_isleaf(tp, dp, &v);

	rval = xfs_dir2_isleaf(dp, &v);

	if (rval)

		goto out_free;

	if (v)
@@ -408,7 +408,7 @@ xfs_dir_removename( 
		goto out_free;

	}



	rval = xfs_dir2_isblock(tp, dp, &v);

	rval = xfs_dir2_isblock(dp, &v);

	if (rval)

		goto out_free;

	if (v) {
@@ -416,7 +416,7 @@ xfs_dir_removename( 
		goto out_free;

	}



	rval = xfs_dir2_isleaf(tp, dp, &v);

	rval = xfs_dir2_isleaf(dp, &v);

	if (rval)

		goto out_free;

	if (v)
@@ -472,7 +472,7 @@ xfs_dir_replace( 
		goto out_free;

	}



	rval = xfs_dir2_isblock(tp, dp, &v);

	rval = xfs_dir2_isblock(dp, &v);

	if (rval)

		goto out_free;

	if (v) {
@@ -480,7 +480,7 @@ xfs_dir_replace( 
		goto out_free;

	}



	rval = xfs_dir2_isleaf(tp, dp, &v);

	rval = xfs_dir2_isleaf(dp, &v);

	if (rval)

		goto out_free;

	if (v)
@@ -531,7 +531,7 @@ xfs_dir_canenter( 
		goto out_free;

	}



	rval = xfs_dir2_isblock(tp, dp, &v);

	rval = xfs_dir2_isblock(dp, &v);

	if (rval)

		goto out_free;

	if (v) {
@@ -539,7 +539,7 @@ xfs_dir_canenter( 
		goto out_free;

	}



	rval = xfs_dir2_isleaf(tp, dp, &v);

	rval = xfs_dir2_isleaf(dp, &v);

	if (rval)

		goto out_free;

	if (v)
@@ -607,7 +607,6 @@ xfs_dir2_grow_inode( 
 */

int

xfs_dir2_isblock(

	xfs_trans_t	*tp,

	xfs_inode_t	*dp,

	int		*vp)		/* out: 1 is block, 0 is not block */

{
@@ -616,7 +615,7 @@ xfs_dir2_isblock( 
	int		rval;



	mp = dp->i_mount;

	if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))

	if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))

		return rval;

	rval = XFS_FSB_TO_B(mp, last) == mp->m_dirblksize;

	ASSERT(rval == 0 || dp->i_d.di_size == mp->m_dirblksize);
@@ -629,7 +628,6 @@ xfs_dir2_isblock( 
 */

int

xfs_dir2_isleaf(

	xfs_trans_t	*tp,

	xfs_inode_t	*dp,

	int		*vp)		/* out: 1 is leaf, 0 is not leaf */

{
@@ -638,7 +636,7 @@ xfs_dir2_isleaf( 
	int		rval;



	mp = dp->i_mount;

	if ((rval = xfs_bmap_last_offset(tp, dp, &last, XFS_DATA_FORK)))

	if ((rval = xfs_bmap_last_offset(dp, &last, XFS_DATA_FORK)))

		return rval;

	*vp = last == mp->m_dirleafblk + (1 << mp->m_sb.sb_dirblklog);

	return 0;

fs/xfs/xfs_dir2.h

+2 −2
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args); 
/*

 * Interface routines used by userspace utilities

 */

extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r);

extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);

extern int xfs_dir2_isblock(struct xfs_inode *dp, int *r);

extern int xfs_dir2_isleaf(struct xfs_inode *dp, int *r);

extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,

				struct xfs_buf *bp);

fs/xfs/xfs_dir2_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -1708,7 +1708,7 @@ xfs_dir2_node_to_leaf( 
	/*

	 * Get the last offset in the file.

	 */

	if ((error = xfs_bmap_last_offset(tp, dp, &fo, XFS_DATA_FORK))) {

	if ((error = xfs_bmap_last_offset(dp, &fo, XFS_DATA_FORK))) {

		return error;

	}

	fo -= mp->m_dirblkfsbs;