diff options
| author | Brian Foster | 2018-08-01 16:20:34 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2018-08-03 08:05:14 +0200 |
| commit | 1ae093cbea3d1ef04e1344b9e3996a9e1763a91b (patch) | |
| tree | 97ac8b95fb070cadc3f10df8dd1f5b82266a83dd /fs/xfs/xfs_trans.h | |
| parent | xfs: cancel dfops on xfs_defer_finish() error (diff) | |
| download | kernel-qcow2-linux-1ae093cbea3d1ef04e1344b9e3996a9e1763a91b.tar.gz kernel-qcow2-linux-1ae093cbea3d1ef04e1344b9e3996a9e1763a91b.tar.xz kernel-qcow2-linux-1ae093cbea3d1ef04e1344b9e3996a9e1763a91b.zip | |
xfs: replace xfs_defer_ops ->dop_pending with on-stack list
The xfs_defer_ops ->dop_pending list is used to track active
deferred operations once intents are logged. These items must be
aborted in the event of an error. The list is populated as intents
are logged and items are removed as they complete (or are aborted).
Now that xfs_defer_finish() cancels on error, there is no need to
ever access ->dop_pending outside of xfs_defer_finish(). The list is
only ever populated after xfs_defer_finish() begins and is either
completed or cancelled before it returns.
Remove ->dop_pending from xfs_defer_ops and replace it with a local
list in the xfs_defer_finish() path. Pass the local list to the
various helpers now that it is not accessible via dfops. Note that
we have to check for NULL in the abort case as the final tx roll
occurs outside of the scope of the new local list (once the dfops
has completed and thus drained the list).
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>
Diffstat (limited to 'fs/xfs/xfs_trans.h')
| -rw-r--r-- | fs/xfs/xfs_trans.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index 299656dbf324..1cdc7c0ebeac 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h @@ -96,7 +96,6 @@ void xfs_log_item_init(struct xfs_mount *mp, struct xfs_log_item *item, #define XFS_DEFER_OPS_NR_BUFS 2 /* join up to two buffers */ struct xfs_defer_ops { struct list_head dop_intake; /* unlogged pending work */ - struct list_head dop_pending; /* logged pending work */ }; /* |