| Message ID | 20180723130414.47980-3-bfoster@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | xfs: embed dfops in the transaction | expand |
On Mon, Jul 23, 2018 at 09:04:01AM -0400, Brian Foster wrote: > 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> Looks good. Reviewed-by: Bill O'Donnell <billodo@redhat.com> > --- > fs/xfs/xfs_log_recover.c | 2 ++ > 1 file changed, 2 insertions(+) > > 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) > -- > 2.17.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 23, 2018 at 09:04:01AM -0400, Brian Foster wrote: > 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> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_log_recover.c | 2 ++ > 1 file changed, 2 insertions(+) > > 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) > -- > 2.17.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)