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

Commit edfd9dd5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: move buffer invalidation to xfs_btree_free_block 



... instead of leaving it in the methods.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent c46ee8ad

fs/xfs/libxfs/xfs_alloc_btree.c

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ xfs_allocbt_free_block( 
	xfs_extent_busy_insert(cur->bc_tp, be32_to_cpu(agf->agf_seqno), bno, 1,

			      XFS_EXTENT_BUSY_SKIP_DISCARD);

	xfs_trans_agbtree_delta(cur->bc_tp, -1);



	xfs_trans_binval(cur->bc_tp, bp);

	return 0;

}

fs/xfs/libxfs/xfs_bmap_btree.c

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ xfs_bmbt_free_block( 


	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L);

	xfs_trans_binval(tp, bp);

	return 0;

}

fs/xfs/libxfs/xfs_btree.c

+3 −1
Original line number Diff line number Diff line
@@ -302,8 +302,10 @@ xfs_btree_free_block( 
	int			error;



	error = cur->bc_ops->free_block(cur, bp);

	if (!error)

	if (!error) {

		xfs_trans_binval(cur->bc_tp, bp);

		XFS_BTREE_STATS_INC(cur, free);

	}

	return error;

}

fs/xfs/libxfs/xfs_ialloc_btree.c

+2 −10
Original line number Diff line number Diff line
@@ -125,16 +125,8 @@ xfs_inobt_free_block( 
	struct xfs_btree_cur	*cur,

	struct xfs_buf		*bp)

{

	xfs_fsblock_t		fsbno;

	int			error;



	fsbno = XFS_DADDR_TO_FSB(cur->bc_mp, XFS_BUF_ADDR(bp));

	error = xfs_free_extent(cur->bc_tp, fsbno, 1);

	if (error)

		return error;



	xfs_trans_binval(cur->bc_tp, bp);

	return error;

	return xfs_free_extent(cur->bc_tp,

			XFS_DADDR_TO_FSB(cur->bc_mp, XFS_BUF_ADDR(bp)), 1);

}



STATIC int