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: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:

committed by
Darrick J. Wong

parent
6aa6718439
commit
0e0417f3e5
@@ -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;
|
||||
|
||||
|
@@ -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 */
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user