1 files changed, 19 insertions, 3 deletions

diff --git a/fs/xfs/xfs_arch.h b/fs/xfs/xfs_arch.h
index 68e5051d8e24..c4836890b726 100644
--- a/fs/xfs/xfs_arch.h
+++ b/fs/xfs/xfs_arch.h
@@ -40,6 +40,22 @@
 #undef XFS_NATIVE_HOST
 #endif
 
+#ifdef XFS_NATIVE_HOST
+#define cpu_to_be16(val)        ((__be16)(val))
+#define cpu_to_be32(val)        ((__be32)(val))
+#define cpu_to_be64(val)        ((__be64)(val))
+#define be16_to_cpu(val)        ((__uint16_t)(val))
+#define be32_to_cpu(val)        ((__uint32_t)(val))
+#define be64_to_cpu(val)        ((__uint64_t)(val))
+#else
+#define cpu_to_be16(val)        (__swab16((__uint16_t)(val)))
+#define cpu_to_be32(val)        (__swab32((__uint32_t)(val)))
+#define cpu_to_be64(val)        (__swab64((__uint64_t)(val)))
+#define be16_to_cpu(val)        (__swab16((__be16)(val)))
+#define be32_to_cpu(val)        (__swab32((__be32)(val)))
+#define be64_to_cpu(val)        (__swab64((__be64)(val)))
+#endif
+
 #endif  /* __KERNEL__ */
 
 /* do we need conversion? */
@@ -186,7 +202,7 @@ static inline void be64_add(__be64 *a, __s64 b)
  */ 
 
 #define XFS_GET_DIR_INO4(di) \
-        (((u32)(di).i[0] << 24) | ((di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
+        (((__u32)(di).i[0] << 24) | ((di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
 
 #define XFS_PUT_DIR_INO4(from, di) \
 do { \
@@ -197,9 +213,9 @@ do { \
 } while (0)
 
 #define XFS_DI_HI(di) \
-        (((u32)(di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
+        (((__u32)(di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))
 #define XFS_DI_LO(di) \
-        (((u32)(di).i[4] << 24) | ((di).i[5] << 16) | ((di).i[6] << 8) | ((di).i[7]))
+        (((__u32)(di).i[4] << 24) | ((di).i[5] << 16) | ((di).i[6] << 8) | ((di).i[7]))
 
 #define XFS_GET_DIR_INO8(di)        \
         (((xfs_ino_t)XFS_DI_LO(di) & 0xffffffffULL) | \