From 621090bbf48e788ac67e64fd7f49ec18107ebd0e Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 23 Sep 2024 13:42:02 -0700 Subject: [PATCH] xfs: allow inodes with zero extents but nonzero nblocks Metadata inodes that store btrees will have zero extents and a nonzero nblocks. Adjust the inode verifier so that this combination is not flagged. Signed-off-by: Darrick J. Wong --- libxfs/xfs_inode_buf.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c index 828800223..bd72afad9 100644 --- a/libxfs/xfs_inode_buf.c +++ b/libxfs/xfs_inode_buf.c @@ -648,9 +648,6 @@ xfs_dinode_verify( if (mode && nextents + naextents > nblocks) return __this_address; - if (nextents + naextents == 0 && nblocks != 0) - return __this_address; - if (S_ISDIR(mode) && nextents > mp->m_dir_geo->max_extents) return __this_address; @@ -754,6 +751,19 @@ xfs_dinode_verify( return fa; } + /* metadata inodes containing btrees always have zero extent count */ + if (flags2 & XFS_DIFLAG2_METADATA) { + switch (XFS_DFORK_FORMAT(dip, XFS_DATA_FORK)) { + case XFS_DINODE_FMT_RMAP: + break; + default: + if (nextents + naextents == 0 && nblocks != 0) + return __this_address; + break; + } + } else if (nextents + naextents == 0 && nblocks != 0) + return __this_address; + return NULL; } -- 2.50.1