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 81bfd0ad04a58892e2c153a22c361e7ff959f3fd: xfs_scrub: remove unused action_list fields (2024-07-29 17:01:07 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git tags/scrub-object-tracking-6.10_2024-07-29 for you to fetch changes up to 8dd67c8eccbe0e6b8dd7975ba53f9ccaf532aa9c: xfs_scrub: hoist scrub retry loop to scrub_item_check_file (2024-07-29 17:01:08 -0700) ---------------------------------------------------------------- xfs_scrub: use scrub_item to track check progress [v30.9 09/28] Now that we've introduced tickets to track the status of repairs to a specific principal XFS object (fs, ag, file), use them to track the scrub state of those same objects. Ultimately, we want to make it easy to introduce vectorized repair, where we send a batch of repair requests to the kernel instead of making millions of ioctl calls. For now, however, we'll settle for easier bookkeepping. 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: start tracking scrub state in scrub_item xfs_scrub: remove enum check_outcome xfs_scrub: refactor scrub_meta_type out of existence xfs_scrub: hoist repair retry loop to repair_item_class xfs_scrub: hoist scrub retry loop to scrub_item_check_file scrub/phase1.c | 3 +- scrub/phase2.c | 12 +- scrub/phase3.c | 41 ++----- scrub/phase4.c | 16 ++- scrub/phase5.c | 5 +- scrub/phase7.c | 5 +- scrub/repair.c | 71 ++++++----- scrub/scrub.c | 321 +++++++++++++++++++++++--------------------------- scrub/scrub.h | 40 +++++-- scrub/scrub_private.h | 14 +++ 10 files changed, 257 insertions(+), 271 deletions(-)
