From: Dave Chinner <david@fromorbit.com>
Date: Mon, 9 Jun 2014 21:32:41 +0000 (+1000)
Subject: Merge branch 'xfs-da-geom' into for-next
X-Git-Tag: v3.16-rc1~46^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8612c7e594808e4a67bc2d4661f5925df2be3f51;p=linux.git

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

8612c7e594808e4a67bc2d4661f5925df2be3f51
diff --cc fs/xfs/xfs_dir2.c
index 93fcebd5edd2,07aa3907d237..79670cda48ae
--- a/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);