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

xfs: remove unused iget_flags param from xfs_imap_to_bp() 



iget_flags is unused in xfs_imap_to_bp(). Remove the parameter and
fix up the callers.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 28d84620

fs/xfs/libxfs/xfs_inode_buf.c

+2 −3
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ xfs_imap_to_bp( 
	struct xfs_imap		*imap,

	struct xfs_dinode       **dipp,

	struct xfs_buf		**bpp,

	uint			buf_flags,

	uint			iget_flags)

	uint			buf_flags)

{

	struct xfs_buf		*bp;

	int			error;
@@ -621,7 +620,7 @@ xfs_iread( 
	/*

	 * Get pointers to the on-disk inode and the buffer containing it.

	 */

	error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0, iget_flags);

	error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0);

	if (error)

		return error;

fs/xfs/libxfs/xfs_inode_buf.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct xfs_imap { 


int	xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,

		       struct xfs_imap *, struct xfs_dinode **,

		       struct xfs_buf **, uint, uint);

		       struct xfs_buf **, uint);

int	xfs_iread(struct xfs_mount *, struct xfs_trans *,

		  struct xfs_inode *, uint);

void	xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);

fs/xfs/scrub/ialloc.c

+1 −2
Original line number Diff line number Diff line
@@ -278,8 +278,7 @@ xchk_iallocbt_check_cluster( 
			&XFS_RMAP_OINFO_INODES);



	/* Grab the inode cluster buffer. */

	error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp,

			0, 0);

	error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp, 0);

	if (!xchk_btree_xref_process_error(bs->sc, bs->cur, 0, &error))

		return error;

fs/xfs/xfs_inode.c

+3 −4
Original line number Diff line number Diff line
@@ -2172,7 +2172,7 @@ xfs_iunlink_update_inode( 


	ASSERT(xfs_verify_agino_or_null(mp, agno, next_agino));



	error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0, 0);

	error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0);

	if (error)

		return error;
@@ -2302,7 +2302,7 @@ xfs_iunlink_map_ino( 
		return error;

	}



	error = xfs_imap_to_bp(mp, tp, imap, dipp, bpp, 0, 0);

	error = xfs_imap_to_bp(mp, tp, imap, dipp, bpp, 0);

	if (error) {

		xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.",

				__func__, error);
@@ -3665,8 +3665,7 @@ xfs_iflush( 
	 * If we get any other error, we effectively have a corruption situation

	 * and we cannot flush the inode. Abort the flush and shut down.

	 */

	error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK,

			       0);

	error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK);

	if (error == -EAGAIN) {

		xfs_ifunlock(ip);

		return error;

fs/xfs/xfs_log_recover.c

+1 −1
Original line number Diff line number Diff line
@@ -4969,7 +4969,7 @@ xlog_recover_process_one_iunlink( 
	/*

	 * Get the on disk inode to find the next inode in the bucket.

	 */

	error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &ibp, 0, 0);

	error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &ibp, 0);

	if (error)

		goto fail_iput;