Message ID | 160031335967.3624461.12775342036527430147.stgit@magnolia (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | xfs: fix how we deal with new intents during recovery | expand |
> list_for_each_entry_safe(dfc, next, dfops_freezers, dfc_list) { > - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, 0, > - 0, XFS_TRANS_RESERVE, &tp); > + error = xfs_trans_alloc(mp, &dfc->dfc_tres, 0, 0, > + XFS_TRANS_RESERVE, &tp); ... and this fixes the weird itruncate thing. Nice!
On Wed, Sep 23, 2020 at 08:49:53AM +0100, Christoph Hellwig wrote: > > list_for_each_entry_safe(dfc, next, dfops_freezers, dfc_list) { > > - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, 0, > > - 0, XFS_TRANS_RESERVE, &tp); > > + error = xfs_trans_alloc(mp, &dfc->dfc_tres, 0, 0, > > + XFS_TRANS_RESERVE, &tp); > > ... and this fixes the weird itruncate thing. Nice! Yep, Dave was also complaining about how weird the itruncate thing was. --D
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c index d1db97ccad51..edfb3b9856c8 100644 --- a/fs/xfs/libxfs/xfs_defer.c +++ b/fs/xfs/libxfs/xfs_defer.c @@ -590,6 +590,9 @@ xfs_defer_capture( dfc->dfc_tpflags = tp->t_flags & XFS_TRANS_LOWMODE; dfc->dfc_blkres = tp->t_blk_res - tp->t_blk_res_used; tp->t_blk_res = tp->t_blk_res_used; + dfc->dfc_tres.tr_logres = tp->t_log_res; + dfc->dfc_tres.tr_logcount = tp->t_log_count; + dfc->dfc_tres.tr_logflags = XFS_TRANS_PERM_LOG_RES; xfs_defer_reset(tp); } diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h index fea610f5d3e1..a788855aef69 100644 --- a/fs/xfs/libxfs/xfs_defer.h +++ b/fs/xfs/libxfs/xfs_defer.h @@ -77,6 +77,7 @@ struct xfs_defer_capture { struct list_head dfc_dfops; unsigned int dfc_tpflags; unsigned int dfc_blkres; + struct xfs_trans_res dfc_tres; }; /* diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 5f664e52c542..f5748c8f5157 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -2503,8 +2503,8 @@ xlog_finish_defer_ops( int error = 0; list_for_each_entry_safe(dfc, next, dfops_freezers, dfc_list) { - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, 0, - 0, XFS_TRANS_RESERVE, &tp); + error = xfs_trans_alloc(mp, &dfc->dfc_tres, 0, 0, + XFS_TRANS_RESERVE, &tp); if (error) break;