From: Darrick J. Wong Date: Thu, 15 Aug 2024 18:57:41 +0000 (-0700) Subject: xfs_repair: reserve per-AG space while rebuilding rt metadata X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=13ccbc4a9c8ef2e0a24a54efa8029f11aace6665;p=users%2Fhch%2Fxfsprogs.git xfs_repair: reserve per-AG space while rebuilding rt metadata Realtime metadata btrees can consume quite a bit of space on a full filesystem. Since the metadata are just regular files, we need to make the per-AG reservations to avoid overfilling any of the AGs while rebuilding metadata. This avoids the situation where a filesystem comes straight from repair and immediately trips over not having enough space in an AG. Signed-off-by: Darrick J. Wong --- diff --git a/include/libxfs.h b/include/libxfs.h index 590ac92e9..566f06b72 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -98,6 +98,7 @@ struct iomap; #include "xfs_rtgroup.h" #include "xfs_rtbitmap.h" #include "xfs_rtrmap_btree.h" +#include "xfs_ag_resv.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) diff --git a/repair/phase6.c b/repair/phase6.c index 518042004..67d5f104f 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -3431,10 +3431,43 @@ _(" - resetting contents of realtime bitmap and summary inodes\n")); } } +static int +reserve_ag_blocks( + struct xfs_mount *mp) +{ + struct xfs_perag *pag; + xfs_agnumber_t agno; + int error = 0; + int err2; + + mp->m_finobt_nores = false; + + for_each_perag(mp, agno, pag) { + err2 = -libxfs_ag_resv_init(pag, NULL); + if (err2 && !error) + error = err2; + } + + return error; +} + +static void +unreserve_ag_blocks( + struct xfs_mount *mp) +{ + struct xfs_perag *pag; + xfs_agnumber_t agno; + + for_each_perag(mp, agno, pag) + libxfs_ag_resv_free(pag); +} + void phase6(xfs_mount_t *mp) { ino_tree_node_t *irec; + bool reserve_perag; + int error; int i; parent_ptr_init(mp); @@ -3479,11 +3512,25 @@ phase6(xfs_mount_t *mp) do_warn(_("would reinitialize metadata root directory\n")); } + reserve_perag = xfs_has_realtime(mp) && !no_modify; + if (reserve_perag) { + error = reserve_ag_blocks(mp); + if (error) { + if (error != ENOSPC) + do_warn( + _("could not reserve per-AG space to rebuild realtime metadata")); + reserve_perag = false; + } + } + if (xfs_has_rtgroups(mp)) reset_rt_metadata_inodes(mp); else reset_rt_sb_inodes(mp); + if (reserve_perag) + unreserve_ag_blocks(mp); + mark_standalone_inodes(mp); do_log(_(" - traversing filesystem ...\n"));