Hi all, Now that we've landed the new kernel code, it's time to reorganize the xfs_scrub code that handles repairs. Clean up various naming warts and misleading error messages. Move the repair code to scrub/repair.c as the first step. Then, fix various issues in the repair code before we start reorganizing things. If you're going to start using this code, I strongly recommend pulling from my git trees, which are linked below. This has been running on the djcloud for months with no problems. Enjoy! Comments and questions are, as always, welcome. xfsprogs git tree: https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-repair-fixes-6.10 --- Commits in this patchset: * xfs_scrub: remove ALP_* flags namespace * xfs_scrub: move repair functions to repair.c * xfs_scrub: log when a repair was unnecessary * xfs_scrub: require primary superblock repairs to complete before proceeding * xfs_scrub: actually try to fix summary counters ahead of repairs --- scrub/phase1.c | 2 scrub/phase2.c | 3 - scrub/phase3.c | 2 scrub/phase4.c | 22 ++++- scrub/phase5.c | 2 scrub/phase7.c | 2 scrub/repair.c | 177 ++++++++++++++++++++++++++++++++++++++++++- scrub/repair.h | 16 +++- scrub/scrub.c | 204 +------------------------------------------------ scrub/scrub.h | 16 ---- scrub/scrub_private.h | 55 +++++++++++++ 11 files changed, 269 insertions(+), 232 deletions(-) create mode 100644 scrub/scrub_private.h