Hi Chandan, Please pull this branch with changes for xfs 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. --D The following changes since commit 327ed702d84034879572812f580cb769848af7ae: xfs: inode repair should ensure there's an attr fork to store parent pointers (2024-04-23 16:55:16 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/scrub-directory-tree-6.10_2024-04-23 for you to fetch changes up to 3f31406aef493b3f19020909d29974e28253f91c: xfs: fix corruptions in the directory tree (2024-04-23 16:55:17 -0700) ---------------------------------------------------------------- xfs: detect and correct directory tree problems [v13.4 6/9] Historically, checking the tree-ness of the directory tree structure has not been complete. Cycles of subdirectories break the tree properties, as do subdirectories with multiple parents. It's easy enough for DFS to detect problems as long as one of the participants is reachable from the root, but this technique cannot find unconnected cycles. Directory parent pointers change that, because we can discover all of these problems from a simple walk from a subdirectory towards the root. For each child we start with, if the walk terminates without reaching the root, we know the path is disconnected and ought to be attached to the lost and found. If we find ourselves, we know this is a cycle and can delete an incoming edge. If we find multiple paths to the root, we know to delete an incoming edge. Even better, once we've finished walking paths, we've identified the good ones and know which other path(s) to remove. This has been running on the djcloud for months with no problems. Enjoy! Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> ---------------------------------------------------------------- Darrick J. Wong (4): xfs: teach online scrub to find directory tree structure problems xfs: invalidate dirloop scrub path data when concurrent updates happen xfs: report directory tree corruption in the health information xfs: fix corruptions in the directory tree fs/xfs/Makefile | 2 + fs/xfs/libxfs/xfs_fs.h | 4 +- fs/xfs/libxfs/xfs_health.h | 4 +- fs/xfs/scrub/common.h | 1 + fs/xfs/scrub/dirtree.c | 985 ++++++++++++++++++++++++++++++++++++++++++ fs/xfs/scrub/dirtree.h | 178 ++++++++ fs/xfs/scrub/dirtree_repair.c | 821 +++++++++++++++++++++++++++++++++++ fs/xfs/scrub/health.c | 1 + fs/xfs/scrub/ino_bitmap.h | 37 ++ fs/xfs/scrub/orphanage.c | 6 + fs/xfs/scrub/orphanage.h | 8 + fs/xfs/scrub/repair.h | 4 + fs/xfs/scrub/scrub.c | 7 + fs/xfs/scrub/scrub.h | 1 + fs/xfs/scrub/stats.c | 1 + fs/xfs/scrub/trace.c | 4 + fs/xfs/scrub/trace.h | 272 +++++++++++- fs/xfs/scrub/xfarray.h | 1 + fs/xfs/xfs_health.c | 1 + fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_inode.h | 1 + 21 files changed, 2337 insertions(+), 4 deletions(-) create mode 100644 fs/xfs/scrub/dirtree.c create mode 100644 fs/xfs/scrub/dirtree.h create mode 100644 fs/xfs/scrub/dirtree_repair.c create mode 100644 fs/xfs/scrub/ino_bitmap.h
