From: Dave Chinner <david@fromorbit.com>
Date: Wed, 20 Jul 2016 01:54:59 +0000 (+1000)
Subject: Merge branch 'xfs-4.8-dir2-sf-fixes' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dc4113d2433e01b06685743552d99573c9d470f3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'xfs-4.8-dir2-sf-fixes' into for-next
---

dc4113d2433e01b06685743552d99573c9d470f3
diff --cc fs/xfs/xfs_ondisk.h
index 17ec0248f771,19cc8b872db1..0cc8d8f74356
--- a/fs/xfs/xfs_ondisk.h
+++ b/fs/xfs/xfs_ondisk.h
@@@ -102,23 -83,15 +102,19 @@@ xfs_check_ondisk_structs(void
  	XFS_CHECK_STRUCT_SIZE(xfs_da_node_hdr_t,		16);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_free_t,		4);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_hdr_t,		16);
 -	XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_unused_t,		6);
 +	XFS_CHECK_OFFSET(xfs_dir2_data_unused_t, freetag,	0);
 +	XFS_CHECK_OFFSET(xfs_dir2_data_unused_t, length,	2);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_hdr_t,		16);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_t,			16);
- 	XFS_CHECK_STRUCT_SIZE(xfs_dir2_ino4_t,			4);
- 	XFS_CHECK_STRUCT_SIZE(xfs_dir2_ino8_t,			8);
- 	XFS_CHECK_STRUCT_SIZE(xfs_dir2_inou_t,			8);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_entry_t,		8);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_hdr_t,		16);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_t,			16);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_tail_t,		4);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_entry_t,		3);
 +	XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, namelen,		0);
 +	XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, offset,		1);
 +	XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, name,		3);
  	XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_hdr_t,		10);
- 	XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_off_t,		2);
  
  	/* log structures */
  	XFS_CHECK_STRUCT_SIZE(struct xfs_dq_logformat,		24);