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 mess, you probably ought to just pull from my git trees, which are linked below. This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome. --D xfsprogs git tree: https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-repair-fixes --- scrub/phase1.c | 2 scrub/phase2.c | 3 - scrub/phase3.c | 2 scrub/phase4.c | 22 ++++- scrub/phase5.c | 2 scrub/phase6.c | 13 +++ scrub/phase7.c | 2 scrub/repair.c | 169 +++++++++++++++++++++++++++++++++++++++++ scrub/repair.h | 16 +++- scrub/scrub.c | 202 +------------------------------------------------ scrub/scrub.h | 16 ---- scrub/scrub_private.h | 55 +++++++++++++ 12 files changed, 273 insertions(+), 231 deletions(-) create mode 100644 scrub/scrub_private.h