Merge branch 'linus'

1 files changed, 7 insertions, 8 deletions

diff --git a/fs/xfs/xfs_dir2_leaf.h b/fs/xfs/xfs_dir2_leaf.h
index 1393993d61e9..f57ca1162412 100644
--- a/fs/xfs/xfs_dir2_leaf.h
+++ b/fs/xfs/xfs_dir2_leaf.h
@@ -46,23 +46,23 @@ typedef	__uint32_t	xfs_dir2_dataptr_t;
  */
 typedef struct xfs_dir2_leaf_hdr {
         xfs_da_blkinfo_t        info;           /* header for da routines */
-        __uint16_t              count;          /* count of entries */
-        __uint16_t              stale;          /* count of stale entries */
+        __be16                  count;          /* count of entries */
+        __be16                  stale;          /* count of stale entries */
 } xfs_dir2_leaf_hdr_t;
 
 /*
  * Leaf block entry.
  */
 typedef struct xfs_dir2_leaf_entry {
-        xfs_dahash_t            hashval;        /* hash value of name */
-        xfs_dir2_dataptr_t      address;        /* address of data entry */
+        __be32                  hashval;        /* hash value of name */
+        __be32                  address;        /* address of data entry */
 } xfs_dir2_leaf_entry_t;
 
 /*
  * Leaf block tail.
  */
 typedef struct xfs_dir2_leaf_tail {
-        __uint32_t              bestcount;
+        __be32                  bestcount;
 } xfs_dir2_leaf_tail_t;
 
 /*
@@ -105,11 +105,10 @@ xfs_dir2_leaf_tail_p(struct xfs_mount *mp, xfs_dir2_leaf_t *lp)
  * Get address of the bests array in the single-leaf block.
  */
 #define XFS_DIR2_LEAF_BESTS_P(ltp)      xfs_dir2_leaf_bests_p(ltp)
-static inline xfs_dir2_data_off_t *
+static inline __be16 *
 xfs_dir2_leaf_bests_p(xfs_dir2_leaf_tail_t *ltp)
 {
-        return (xfs_dir2_data_off_t *)
-                (ltp) - INT_GET((ltp)->bestcount, ARCH_CONVERT);
+        return (__be16 *)ltp - be32_to_cpu(ltp->bestcount);
 }
 
 /*