From: Darrick J. Wong <djwong@xxxxxxxxxx>
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 <djwong@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_inode_buf.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 5ed779cbe6f9f..dae2efec1d5d0 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -601,9 +601,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;
@@ -707,6 +704,19 @@ xfs_dinode_verify(
return fa;
}
+ /* metadata inodes containing btrees always have zero extent count */
+ if (flags2 & XFS_DIFLAG2_METADIR) {
+ 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;
}
