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>
This commit is contained in:

committed by
Darrick J. Wong

parent
82ff27bc52
commit
a8198666fb
@@ -1119,7 +1119,6 @@ xfs_bmap_add_attrfork(
|
||||
xfs_log_sb(tp);
|
||||
}
|
||||
|
||||
xfs_defer_ijoin(tp->t_dfops, ip);
|
||||
error = xfs_trans_commit(tp);
|
||||
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
||||
return error;
|
||||
@@ -5987,7 +5986,6 @@ __xfs_bmap_add(
|
||||
int whichfork,
|
||||
struct xfs_bmbt_irec *bmap)
|
||||
{
|
||||
int error;
|
||||
struct xfs_bmap_intent *bi;
|
||||
|
||||
trace_xfs_bmap_defer(mp,
|
||||
@@ -6006,12 +6004,6 @@ __xfs_bmap_add(
|
||||
bi->bi_whichfork = whichfork;
|
||||
bi->bi_bmap = *bmap;
|
||||
|
||||
error = xfs_defer_ijoin(dfops, bi->bi_owner);
|
||||
if (error) {
|
||||
kmem_free(bi);
|
||||
return error;
|
||||
}
|
||||
|
||||
xfs_defer_add(dfops, XFS_DEFER_OPS_TYPE_BMAP, &bi->bi_list);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user