Hi Carlos, Please pull this branch with changes for xfsprogs for 6.10-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. The following changes since commit ebf05a446c09336c08865dc29a6332be6ff8223c: mkfs/repair: pin inodes that would otherwise overflow link count (2024-07-29 17:01:06 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git tags/scrub-repair-fixes-6.10_2024-07-29 for you to fetch changes up to 4b959abc5f353123775973cd98c94d819cc9de79: xfs_scrub: actually try to fix summary counters ahead of repairs (2024-07-29 17:01:06 -0700) ---------------------------------------------------------------- xfs_scrub: fixes to the repair code [v30.9 06/28] 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. This has been running on the djcloud for months with no problems. Enjoy! Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> ---------------------------------------------------------------- Darrick J. Wong (5): 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
