Merge branch 'xfs-da-geom' into for-next

diff --cc fs/xfs/xfs_da_btree.c
Simple merge

diff --cc fs/xfs/xfs_dir2.c
index 93fcebd5edd24b2d33373373ed00dd0f577fae2b,07aa3907d237ea3dcea89de0870c94e23a95b88b..79670cda48ae4797f902af912d59d105215885bb
--- 1/fs/xfs/xfs_dir2.c
--- 2/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@@ -85,14 -85,15 +85,15 @@@ static struct xfs_nameops xfs_ascii_ci_
        .compname       = xfs_ascii_ci_compname,
  };
  
- void
- xfs_dir_mount(
-       xfs_mount_t     *mp)
+ int
+ xfs_da_mount(
+       struct xfs_mount        *mp)
  {
-       int     nodehdr_size;
+       struct xfs_da_geometry  *dageo;
+       int                     nodehdr_size;
  
  
 -      ASSERT(xfs_sb_version_hasdirv2(&mp->m_sb));
 +      ASSERT(mp->m_sb.sb_versionnum & XFS_SB_VERSION_DIRV2BIT);
        ASSERT((1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog)) <=
               XFS_MAX_BLOCKSIZE);
  

diff --cc fs/xfs/xfs_fsops.c
Simple merge

diff --cc fs/xfs/xfs_mount.c
Simple merge