summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_recover.c
diff options
context:
space:
mode:
authorBrian Foster <bfoster@redhat.com>2018-07-24 13:43:08 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2018-07-26 10:15:12 -0700
commita61acc3c78df14bb9b7bfefb2cc771fcda15b8fe (patch)
tree3a360cb10302c72f9e95800810ca2b32abfef40c /fs/xfs/xfs_log_recover.c
parent02dff7bf81685b6770a082243060e0b5aac348cf (diff)
downloadtalos-obmc-linux-a61acc3c78df14bb9b7bfefb2cc771fcda15b8fe.tar.gz
talos-obmc-linux-a61acc3c78df14bb9b7bfefb2cc771fcda15b8fe.zip
xfs: use ->t_dfops in log recovery intent processing
xlog_finish_defer_ops() processes the deferred operations collected over the entire intent recovery sequence. We can't xfs_defer_init() here because the dfops is already populated. Attach it manually and eliminate the last caller of xfs_defer_finish() that doesn't pass ->t_dfops. Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bill O'Donnell <billodo@redhat.com> 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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index cbac943896f4..3289811eb076 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -4854,6 +4854,8 @@ 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;
error = xfs_defer_finish(&tp, dfops);
if (error)
OpenPOWER on IntegriCloud