1 files changed, 10 insertions, 6 deletions

diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index d3ff96c321f9..edf203ab50af 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -90,6 +90,9 @@ void
 xfs_dir_mount(
         xfs_mount_t     *mp)
 {
+        int     nodehdr_size;
+
+
         ASSERT(xfs_sb_version_hasdirv2(&mp->m_sb));
         ASSERT((1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog)) <=
                XFS_MAX_BLOCKSIZE);
@@ -98,12 +101,13 @@ xfs_dir_mount(
         mp->m_dirdatablk = xfs_dir2_db_to_da(mp, XFS_DIR2_DATA_FIRSTDB(mp));
         mp->m_dirleafblk = xfs_dir2_db_to_da(mp, XFS_DIR2_LEAF_FIRSTDB(mp));
         mp->m_dirfreeblk = xfs_dir2_db_to_da(mp, XFS_DIR2_FREE_FIRSTDB(mp));
-        mp->m_attr_node_ents =
-                (mp->m_sb.sb_blocksize - (uint)sizeof(xfs_da_node_hdr_t)) /
-                (uint)sizeof(xfs_da_node_entry_t);
-        mp->m_dir_node_ents =
-                (mp->m_dirblksize - (uint)sizeof(xfs_da_node_hdr_t)) /
-                (uint)sizeof(xfs_da_node_entry_t);
+
+        nodehdr_size = __xfs_da3_node_hdr_size(xfs_sb_version_hascrc(&mp->m_sb));
+        mp->m_attr_node_ents = (mp->m_sb.sb_blocksize - nodehdr_size) /
+                                (uint)sizeof(xfs_da_node_entry_t);
+        mp->m_dir_node_ents = (mp->m_dirblksize - nodehdr_size) /
+                                (uint)sizeof(xfs_da_node_entry_t);
+
         mp->m_dir_magicpct = (mp->m_dirblksize * 37) / 100;
         if (xfs_sb_version_hasasciici(&mp->m_sb))
                 mp->m_dirnameops = &xfs_ascii_ci_nameops;