On Mon, Sep 30, 2024 at 06:41:44PM +0200, Christoph Hellwig wrote:
> Primary superblock buffers that change the file system geometry after a
> growfs operation can affect the operation of later CIL checkpoints that
> make use of the newly added space and allocation groups.
>
> Apply the changes to the in-memory structures as part of recovery pass 2,
> to ensure recovery works fine for such cases.
>
> In the future we should apply the logic to other updates such as features
> bits as well.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_log_recover.h | 2 ++
> fs/xfs/xfs_buf_item_recover.c | 27 +++++++++++++++++++++++++++
> fs/xfs/xfs_log_recover.c | 27 +++++++++++++++++++--------
> 3 files changed, 48 insertions(+), 8 deletions(-)
>
...
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 6a165ca55da1a8..03701409c7dcd6 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -3334,6 +3334,25 @@ xlog_do_log_recovery(
> return error;
> }
>
> +int
> +xlog_recover_update_agcount(
> + struct xfs_mount *mp,
> + struct xfs_dsb *dsb)
> +{
> + xfs_agnumber_t old_agcount = mp->m_sb.sb_agcount;
> + int error;
> +
> + xfs_sb_from_disk(&mp->m_sb, dsb);
> + error = xfs_initialize_perag(mp, old_agcount, mp->m_sb.sb_agcount,
> + mp->m_sb.sb_dblocks, &mp->m_maxagi);
> + if (error) {
> + xfs_warn(mp, "Failed recovery per-ag init: %d", error);
> + return error;
> + }
> + mp->m_alloc_set_aside = xfs_alloc_set_aside(mp);
Re: my comments on patch 1, it looks like this also doesn't need to
change unless the superblock update actually changed the AG count.
Otherwise seems Ok in terms of the context change.
Brian
> + return 0;
> +}
> +
> /*
> * Do the actual recovery
> */
> @@ -3346,7 +3365,6 @@ xlog_do_recover(
> struct xfs_mount *mp = log->l_mp;
> struct xfs_buf *bp = mp->m_sb_bp;
> struct xfs_sb *sbp = &mp->m_sb;
> - xfs_agnumber_t old_agcount = sbp->sb_agcount;
> int error;
>
> trace_xfs_log_recover(log, head_blk, tail_blk);
> @@ -3394,13 +3412,6 @@ xlog_do_recover(
> /* re-initialise in-core superblock and geometry structures */
> mp->m_features |= xfs_sb_version_to_features(sbp);
> xfs_reinit_percpu_counters(mp);
> - error = xfs_initialize_perag(mp, old_agcount, sbp->sb_agcount,
> - sbp->sb_dblocks, &mp->m_maxagi);
> - if (error) {
> - xfs_warn(mp, "Failed post-recovery per-ag init: %d", error);
> - return error;
> - }
> - mp->m_alloc_set_aside = xfs_alloc_set_aside(mp);
>
> /* Normal transactions can now occur */
> clear_bit(XLOG_ACTIVE_RECOVERY, &log->l_opstate);
> --
> 2.45.2
>
>
