xfsprogs: move __be*/__le* types and __arch_pack to xfs_arch.h

These are defines and typedefs only needed for the XFS on disk format,
so there is no need to have the available for every user of xfs.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
index 529c0a6f4ae05f1ac7239e301f8c5785118b9ecf..81741c472cd0ba92b5062684a5f60f298337b51d 100644 (file)
--- a/include/platform_defs.h.in
+++ b/include/platform_defs.h.in
@@ -50,22 +50,6 @@ typedef unsigned long long int       __u64;
 typedef signed long long int   __s64;
 #endif
 
-#ifdef __CHECKER__
-#define __bitwise              __attribute__((bitwise))
-#define __force                        __attribute__((force))
-#else
-#define __bitwise
-#define __force
-#endif
-
-typedef __u16  __bitwise       __le16;
-typedef __u32  __bitwise       __le32;
-typedef __u64  __bitwise       __le64;
-
-typedef __u16  __bitwise       __be16;
-typedef __u32  __bitwise       __be32;
-typedef __u64  __bitwise       __be64;
-
 typedef struct filldir         filldir_t;
 
 #if defined(__linux__)
@@ -130,13 +114,6 @@ typedef unsigned short umode_t;
                                        | (minor&IRIX_DEV_MAXMIN)))
 #define IRIX_DEV_TO_KDEVT(dev) makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev))
 
-/* ARM old ABI has some weird alignment/padding */
-#if defined(__arm__) && !defined(__ARM_EABI__)
-#define __arch_pack __attribute__((packed))
-#else
-#define __arch_pack
-#endif
-
 #ifndef min
 #define min(a,b)       (((a)<(b))?(a):(b))
 #define max(a,b)       (((a)>(b))?(a):(b))

diff --git a/include/xfs_arch.h b/include/xfs_arch.h
index 310a17e8327de9b1ca8fcb4feb9dc94b8e38a3b8..87650f100c03c0995f15fa32beebf2714ca98356 100644 (file)
--- a/include/xfs_arch.h
+++ b/include/xfs_arch.h
@@ -24,6 +24,22 @@
 #undef XFS_NATIVE_HOST
 #endif
 
+#ifdef __CHECKER__
+#define __bitwise              __attribute__((bitwise))
+#define __force                        __attribute__((force))
+#else
+#define __bitwise
+#define __force
+#endif
+
+typedef __u16  __bitwise       __le16;
+typedef __u32  __bitwise       __le32;
+typedef __u64  __bitwise       __le64;
+
+typedef __u16  __bitwise       __be16;
+typedef __u32  __bitwise       __be32;
+typedef __u64  __bitwise       __be64;
+
 /*
  * Casts are necessary for constants, because we never know how for sure
  * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
@@ -262,4 +278,11 @@ static inline void put_unaligned_be64(__uint64_t val, void *p)
        put_unaligned_be32(val, p + 4);
 }
 
+/* ARM old ABI has some weird alignment/padding */
+#if defined(__arm__) && !defined(__ARM_EABI__)
+#define __arch_pack __attribute__((packed))
+#else
+#define __arch_pack
+#endif
+
 #endif /* __XFS_ARCH_H__ */