repair: always call into phase5()

Make the phase5() function handle the rt file checking for the no-modify
case instead of special casing it in the main repair flow.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/repair/phase5.c b/repair/phase5.c
index 79499754ebf25f1ec9135c3b1de57228cf0261fe..65bdf942dc89dae95a6ac645ebe4022eca1f7ba9 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -751,6 +751,14 @@ phase5(xfs_mount_t *mp)
        xfs_agnumber_t          agno;
        int                     error;
 
+       if (no_modify) {
+               printf(_("No modify flag set, skipping phase 5\n"));
+
+               if (mp->m_sb.sb_rblocks > 0)
+                       check_rtmetadata(mp);
+               return;
+       }
+
        do_log(_("Phase 5 - rebuild AG headers and trees...\n"));
        set_progress_msg(PROG_FMT_REBUILD_AG, (uint64_t)glob_agcount);
 

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 589090b57723c4629e3938f345a940222a3e32c4..7a231597b3c5097f49ca04996df36bb0e9c09ea5 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -1461,14 +1461,7 @@ main(int argc, char **argv)
        phase4(mp);
        phase_end(mp, 4);
 
-       if (no_modify) {
-               printf(_("No modify flag set, skipping phase 5\n"));
-
-               if (mp->m_sb.sb_rblocks > 0)
-                       check_rtmetadata(mp);
-       } else {
-               phase5(mp);
-       }
+       phase5(mp);
        phase_end(mp, 5);
        rcbagbt_destroy_cur_cache();