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 <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index a3993e4d8aedbd82d3dd73580e88be8040c044f1..99a2447f1fc910f8465e3ad9b4f4ed43b2137713 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -652,9 +652,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;
 
@@ -758,6 +755,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;
 }