Hi all, with the scrub and online repair code we now duplicate the switching between the directory format for directory operations in at least two places for each operation, with the metadir code adding even more for some of these operations. This series adds _args helpers to consolidate this code, and then refactors the checking for the directory format into a single well-defined helper. This is now based against the for-next branch in the xfs tree. Changes since v1: - removed two stray whitespaces in the last patch Diffstat: libxfs/xfs_dir2.c | 274 +++++++++++++++++++++++--------------------------- libxfs/xfs_dir2.h | 17 ++- libxfs/xfs_exchmaps.c | 9 - scrub/dir.c | 3 scrub/dir_repair.c | 58 ---------- scrub/readdir.c | 59 +--------- xfs_dir2_readdir.c | 19 +-- 7 files changed, 168 insertions(+), 271 deletions(-)