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

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

xfs: remove dfops parameter from ifree call stack 



The inode free callchain starting in xfs_inactive_ifree() already
associates its dfops with the transaction. It still passes the dfops
on the stack down through xfs_difree_inobt(), however.

Clean up the call stack and reference dfops directly from the
transaction. This patch does not change behavior.

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 6aa67184

fs/xfs/libxfs/xfs_ialloc.c

+2 −4
Original line number Diff line number Diff line
@@ -1915,7 +1915,6 @@ xfs_difree_inobt( 
	struct xfs_trans		*tp,

	struct xfs_buf			*agbp,

	xfs_agino_t			agino,

	struct xfs_defer_ops		*dfops,

	struct xfs_icluster		*xic,

	struct xfs_inobt_rec_incore	*orec)

{
@@ -2003,7 +2002,7 @@ xfs_difree_inobt( 
			goto error0;

		}



		xfs_difree_inode_chunk(mp, agno, &rec, dfops);

		xfs_difree_inode_chunk(mp, agno, &rec, tp->t_dfops);

	} else {

		xic->deleted = false;
@@ -2148,7 +2147,6 @@ int 
xfs_difree(

	struct xfs_trans	*tp,		/* transaction pointer */

	xfs_ino_t		inode,		/* inode to be freed */

	struct xfs_defer_ops	*dfops,		/* extents to free */

	struct xfs_icluster	*xic)	/* cluster info if deleted */

{

	/* REFERENCED */
@@ -2200,7 +2198,7 @@ xfs_difree( 
	/*

	 * Fix up the inode allocation btree.

	 */

	error = xfs_difree_inobt(mp, tp, agbp, agino, dfops, xic, &rec);

	error = xfs_difree_inobt(mp, tp, agbp, agino, xic, &rec);

	if (error)

		goto error0;

fs/xfs/libxfs/xfs_ialloc.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ int /* error */ 
xfs_difree(

	struct xfs_trans *tp,		/* transaction pointer */

	xfs_ino_t	inode,		/* inode to be freed */

	struct xfs_defer_ops *dfops,	/* extents to free */

	struct xfs_icluster *ifree);	/* cluster info if deleted */



/*

fs/xfs/xfs_inode.c

+4 −5
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ xfs_inactive_ifree( 


	xfs_defer_init(&dfops, &first_block);

	tp->t_dfops = &dfops;

	error = xfs_ifree(tp, ip, &dfops);

	error = xfs_ifree(tp, ip);

	if (error) {

		/*

		 * If we fail to free the inode, shut down.  The cancel
@@ -2445,9 +2445,8 @@ xfs_ifree_local_data( 
 */

int

xfs_ifree(

	xfs_trans_t	*tp,

	xfs_inode_t	*ip,

	struct xfs_defer_ops	*dfops)

	struct xfs_trans	*tp,

	struct xfs_inode	*ip)

{

	int			error;

	struct xfs_icluster	xic = { 0 };
@@ -2466,7 +2465,7 @@ xfs_ifree( 
	if (error)

		return error;



	error = xfs_difree(tp, ip->i_ino, dfops, &xic);

	error = xfs_difree(tp, ip->i_ino, &xic);

	if (error)

		return error;

fs/xfs/xfs_inode.h

+1 −2
Original line number Diff line number Diff line
@@ -415,8 +415,7 @@ uint xfs_ilock_data_map_shared(struct xfs_inode *); 
uint		xfs_ilock_attr_map_shared(struct xfs_inode *);



uint		xfs_ip2xflags(struct xfs_inode *);

int		xfs_ifree(struct xfs_trans *, xfs_inode_t *,

			   struct xfs_defer_ops *);

int		xfs_ifree(struct xfs_trans *, struct xfs_inode *);

int		xfs_itruncate_extents_flags(struct xfs_trans **,

				struct xfs_inode *, int, xfs_fsize_t, int);

void		xfs_iext_realloc(xfs_inode_t *, int, int);