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 4b959abc5f353123775973cd98c94d819cc9de79: xfs_scrub: actually try to fix summary counters ahead of repairs (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-better-repair-warnings-6.10_2024-07-29 for you to fetch changes up to bf15d7766e3dd63eda56f6b2f7976e529cd07575: xfs_scrub: enable users to bump information messages to warnings (2024-07-29 17:01:07 -0700) ---------------------------------------------------------------- xfs_scrub: improve warnings about difficult repairs [v30.9 07/28] While I was poking through the QA results for xfs_scrub, I noticed that it doesn't warn the user when the primary and secondary realtime metadata are so out of whack that the chances of a successful repair are not so high. I decided that it was worth refactoring the scrub code a bit so that we could warn the user about these types of things, and ended up refactoring unnecessary helpers out of existence and fixing other reporting gaps. This has been running on the djcloud for months with no problems. Enjoy! Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> ---------------------------------------------------------------- Darrick J. Wong (8): xfs_scrub: fix missing scrub coverage for broken inodes xfs_scrub: collapse trivial superblock scrub helpers xfs_scrub: get rid of trivial fs metadata scanner helpers xfs_scrub: split up the mustfix repairs and difficulty assessment functions xfs_scrub: add missing repair types to the mustfix and difficulty assessment xfs_scrub: any inconsistency in metadata should trigger difficulty warnings xfs_scrub: warn about difficult repairs to rt and quota metadata xfs_scrub: enable users to bump information messages to warnings man/man8/xfs_scrub.8 | 19 +++++++++++++++++++ scrub/common.c | 2 ++ scrub/phase1.c | 2 +- scrub/phase2.c | 53 ++++++++++++++++++++++++++++++++-------------------- scrub/phase3.c | 21 +++++++++++++++++---- scrub/phase4.c | 9 +++++---- scrub/phase5.c | 15 +++++++-------- scrub/repair.c | 47 +++++++++++++++++++++++++++++++++++----------- scrub/repair.h | 10 +++++++--- scrub/scrub.c | 52 +-------------------------------------------------- scrub/scrub.h | 7 ++----- scrub/xfs_scrub.c | 45 +++++++++++++++++++++++++++++++++++++++++++- scrub/xfs_scrub.h | 1 + 13 files changed, 175 insertions(+), 108 deletions(-)
