xfs: automatic dfops inode relogging

Inodes that are held across deferred operations are explicitly
joined to the dfops structure to ensure appropriate relogging.
While inodes are currently joined explicitly, we can detect the
conditions that require relogging at dfops finish time by inspecting
the transaction item list for inodes with ili_lock_flags == 0.

Replace the xfs_defer_ijoin() infrastructure with such detection and
automatic relogging of held inodes. This eliminates the need for the
per-dfops inode list, replaced by an on-stack variant in
xfs_defer_trans_roll().

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>

1 files changed, 0 insertions, 4 deletions

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 0c58a66b39e5..30ac1300dc49 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -979,7 +979,6 @@ xfs_alloc_file_space(
                 /*
                  * Complete the transaction
                  */
-                xfs_defer_ijoin(tp->t_dfops, ip);
                 error = xfs_trans_commit(tp);
                 xfs_iunlock(ip, XFS_ILOCK_EXCL);
                 if (error)
@@ -1037,8 +1036,6 @@ xfs_unmap_extent(
         if (error)
                 goto out_trans_cancel;
 
-        xfs_defer_ijoin(tp->t_dfops, ip);
-
         error = xfs_trans_commit(tp);
 out_unlock:
         xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -1624,7 +1621,6 @@ xfs_swap_extent_rmap(
                         if (error)
                                 goto out_defer;
 
-                        xfs_defer_ijoin(tp->t_dfops, ip);
                         error = xfs_defer_finish(tpp);
                         tp = *tpp;
                         if (error)