diff options
| author | Brian Foster | 2018-07-24 22:43:13 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2018-07-26 19:15:15 +0200 |
| commit | 91ef75b6572498face47746c253926e733a4da3b (patch) | |
| tree | ced5fa1936991dd3a718d0ef4176f9d4e9fd3eca /fs/xfs/xfs_log_recover.c | |
| parent | xfs: use internal dfops in attr code (diff) | |
| download | kernel-qcow2-linux-91ef75b6572498face47746c253926e733a4da3b.tar.gz kernel-qcow2-linux-91ef75b6572498face47746c253926e733a4da3b.tar.xz kernel-qcow2-linux-91ef75b6572498face47746c253926e733a4da3b.zip | |
xfs: use internal dfops during [b|c]ui recovery
bmap and refcount intent processing associates a dfops from the
caller with a local transaction to collect all deferred items for
post-processing. Use the internal dfops in both of these functions
and move the deferred items to the parent dfops before the
transaction commits.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@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_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 3289811eb076..958e9b96dc6a 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -4854,10 +4854,10 @@ xlog_finish_defer_ops( 0, XFS_TRANS_RESERVE, &tp); if (error) return error; - /* dfops is already populated so assign it manually */ - tp->t_dfops = dfops; + /* transfer all collected dfops to this transaction */ + xfs_defer_move(tp->t_dfops, dfops); - error = xfs_defer_finish(&tp, dfops); + error = xfs_defer_finish(&tp, tp->t_dfops); if (error) goto out_cancel; |