From: Brian Foster Date: Tue, 24 Jul 2018 20:43:08 +0000 (-0700) Subject: xfs: use ->t_dfops in log recovery intent processing X-Git-Tag: v4.19-rc1~175^2~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a61acc3c78df14bb9b7bfefb2cc771fcda15b8fe;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Christoph Hellwig Reviewed-by: Bill O'Donnell Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong --- diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index cbac943896f4c..3289811eb0760 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)