xfsprogs: remove swab.h

The macros in swab.h are only used to implement those in xfs_arch.h, so let's
consolidate the two headers.

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/Makefile b/include/Makefile
index 01c886db3a1c3b526653c01d4bbe49d7a566b7bd..7ca83cfdf07051198fddc5c900d5f3027da9af58 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -28,7 +28,6 @@ QAHFILES = libxfs.h \
        list.h \
        parent.h \
        radix-tree.h \
-       swab.h \
        xfs_arch.h \
        xfs_btree_trace.h \
        xfs_inode.h \

diff --git a/include/gnukfreebsd.h b/include/gnukfreebsd.h
index f2e1bf5eb0c575e73eb4b87d9a474846655bd6f1..b83c1442af99fc8703bd5ae227d34edef2770754 100644 (file)
--- a/include/gnukfreebsd.h
+++ b/include/gnukfreebsd.h
@@ -31,7 +31,6 @@
 #include <ctype.h>
 #include <libgen.h>
 #include <paths.h>
-#include "xfs/swab.h"
 
 #define constpp        char * const *
 

diff --git a/include/libxfs.h b/include/libxfs.h
index ab4cc9a5231acdac4da75cbdb2ef9979bcf82bba..eda664f5dc864314a1368047ad32d8589bdb6a52 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -28,7 +28,6 @@
 #include "xfs/bitops.h"
 #include "xfs/kmem.h"
 #include "xfs/radix-tree.h"
-#include "xfs/swab.h"
 #include "xfs/atomic.h"
 
 #include "xfs/xfs_types.h"

diff --git a/include/swab.h b/include/swab.h
deleted file mode 100644 (file)
index b06346c..0000000
--- a/include/swab.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#ifndef SWAB_H
-#define SWAB_H
-
-/* 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.
- */
-#define ___swab16(x) \
-({ \
-       __u16 __x = (x); \
-       ((__u16)( \
-               (((__u16)(__x) & (__u16)0x00ffU) << 8) | \
-               (((__u16)(__x) & (__u16)0xff00U) >> 8) )); \
-})
-
-#define ___swab32(x) \
-({ \
-       __u32 __x = (x); \
-       ((__u32)( \
-               (((__u32)(__x) & (__u32)0x000000ffUL) << 24) | \
-               (((__u32)(__x) & (__u32)0x0000ff00UL) <<  8) | \
-               (((__u32)(__x) & (__u32)0x00ff0000UL) >>  8) | \
-               (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); \
-})
-
-#define ___swab64(x) \
-({ \
-       __u64 __x = (x); \
-       ((__u64)( \
-               (__u64)(((__u64)(__x) & (__u64)0x00000000000000ffULL) << 56) | \
-               (__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) | \
-               (__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) | \
-               (__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) <<  8) | \
-               (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >>  8) | \
-               (__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
-               (__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) | \
-               (__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56) )); \
-})
-
-#define ___constant_swab16(x) \
-       ((__u16)( \
-               (((__u16)(x) & (__u16)0x00ffU) << 8) | \
-               (((__u16)(x) & (__u16)0xff00U) >> 8) ))
-#define ___constant_swab32(x) \
-       ((__u32)( \
-               (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
-               (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
-               (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) | \
-               (((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
-#define ___constant_swab64(x) \
-       ((__u64)( \
-               (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
-               (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
-               (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
-               (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) | \
-               (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) | \
-               (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
-               (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
-               (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))
-
-/*
- * provide defaults when no architecture-specific optimization is detected
- */
-#ifndef __arch__swab16
-#  define __arch__swab16(x) ({ __u16 __tmp = (x) ; ___swab16(__tmp); })
-#endif
-#ifndef __arch__swab32
-#  define __arch__swab32(x) ({ __u32 __tmp = (x) ; ___swab32(__tmp); })
-#endif
-#ifndef __arch__swab64
-#  define __arch__swab64(x) ({ __u64 __tmp = (x) ; ___swab64(__tmp); })
-#endif
-
-#ifndef __arch__swab16p
-#  define __arch__swab16p(x) __arch__swab16(*(x))
-#endif
-#ifndef __arch__swab32p
-#  define __arch__swab32p(x) __arch__swab32(*(x))
-#endif
-#ifndef __arch__swab64p
-#  define __arch__swab64p(x) __arch__swab64(*(x))
-#endif
-
-#ifndef __arch__swab16s
-#  define __arch__swab16s(x) do { *(x) = __arch__swab16p((x)); } while (0)
-#endif
-#ifndef __arch__swab32s
-#  define __arch__swab32s(x) do { *(x) = __arch__swab32p((x)); } while (0)
-#endif
-#ifndef __arch__swab64s
-#  define __arch__swab64s(x) do { *(x) = __arch__swab64p((x)); } while (0)
-#endif
-
-
-/*
- * Allow constant folding
- */
-#  define __swab16(x) \
-(__builtin_constant_p((__u16)(x)) ? \
- ___constant_swab16((x)) : \
- __fswab16((x)))
-#  define __swab32(x) \
-(__builtin_constant_p((__u32)(x)) ? \
- ___constant_swab32((x)) : \
- __fswab32((x)))
-#  define __swab64(x) \
-(__builtin_constant_p((__u64)(x)) ? \
- ___constant_swab64((x)) : \
- __fswab64((x)))
-
-
-static __inline__ __u16 __fswab16(__u16 x)
-{
-       return (__extension__ __arch__swab16(x));
-}
-static __inline__ __u16 __swab16p(__u16 *x)
-{
-       return (__extension__ __arch__swab16p(x));
-}
-static __inline__ void __swab16s(__u16 *addr)
-{
-       (__extension__ ({__arch__swab16s(addr);}));
-}
-
-static __inline__ __u32 __fswab32(__u32 x)
-{
-       return (__extension__ __arch__swab32(x));
-}
-static __inline__ __u32 __swab32p(__u32 *x)
-{
-       return (__extension__ __arch__swab32p(x));
-}
-static __inline__ void __swab32s(__u32 *addr)
-{
-       (__extension__ ({__arch__swab32s(addr);}));
-}
-
-static __inline__ __u64 __fswab64(__u64 x)
-{
-#  ifdef __SWAB_64_THRU_32__
-       __u32 h = x >> 32;
-       __u32 l = x & ((1ULL<<32)-1);
-       return (((__u64)__swab32(l)) << 32) | ((__u64)(__swab32(h)));
-#  else
-       return (__extension__ __arch__swab64(x));
-#  endif
-}
-static __inline__ __u64 __swab64p(__u64 *x)
-{
-       return (__extension__ __arch__swab64p(x));
-}
-static __inline__ void __swab64s(__u64 *addr)
-{
-       (__extension__ ({__arch__swab64s(addr);}));
-}
-
-static inline __uint16_t get_unaligned_be16(void *p)
-{
-       __uint8_t *__p = p;
-       return __p[0] << 8 | __p[1];
-}
-
-static inline __uint32_t get_unaligned_be32(void *p)
-{
-       __uint8_t *__p = p;
-        return __p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3];
-}
-
-static inline __uint64_t get_unaligned_be64(void *p)
-{
-       return (__uint64_t)get_unaligned_be32(p) << 32 |
-                          get_unaligned_be32(p + 4);
-}
-
-static inline void put_unaligned_be16(__uint16_t val, void *p)
-{
-       __uint8_t *__p = p;
-       *__p++ = val >> 8;
-       *__p++ = val;
-}
-
-static inline void put_unaligned_be32(__uint32_t val, void *p)
-{
-       __uint8_t *__p = p;
-       put_unaligned_be16(val >> 16, __p);
-       put_unaligned_be16(val, __p + 2);
-}
-
-static inline void put_unaligned_be64(__uint64_t val, void *p)
-{
-       put_unaligned_be32(val >> 32, p);
-       put_unaligned_be32(val, p + 4);
-}
-
-#endif /* SWAB_H */

diff --git a/include/xfs_arch.h b/include/xfs_arch.h
index 903b02ac0fdd0aaf0badf0fa2fc986361c2d4228..310a17e8327de9b1ca8fcb4feb9dc94b8e38a3b8 100644 (file)
--- a/include/xfs_arch.h
+++ b/include/xfs_arch.h
@@ -24,6 +24,159 @@
 #undef XFS_NATIVE_HOST
 #endif
 
+/*
+ * 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.
+ */
+#define ___swab16(x) \
+({ \
+       __u16 __x = (x); \
+       ((__u16)( \
+               (((__u16)(__x) & (__u16)0x00ffU) << 8) | \
+               (((__u16)(__x) & (__u16)0xff00U) >> 8) )); \
+})
+
+#define ___swab32(x) \
+({ \
+       __u32 __x = (x); \
+       ((__u32)( \
+               (((__u32)(__x) & (__u32)0x000000ffUL) << 24) | \
+               (((__u32)(__x) & (__u32)0x0000ff00UL) <<  8) | \
+               (((__u32)(__x) & (__u32)0x00ff0000UL) >>  8) | \
+               (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); \
+})
+
+#define ___swab64(x) \
+({ \
+       __u64 __x = (x); \
+       ((__u64)( \
+               (__u64)(((__u64)(__x) & (__u64)0x00000000000000ffULL) << 56) | \
+               (__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) | \
+               (__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) | \
+               (__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) <<  8) | \
+               (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >>  8) | \
+               (__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
+               (__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) | \
+               (__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56) )); \
+})
+
+#define ___constant_swab16(x) \
+       ((__u16)( \
+               (((__u16)(x) & (__u16)0x00ffU) << 8) | \
+               (((__u16)(x) & (__u16)0xff00U) >> 8) ))
+#define ___constant_swab32(x) \
+       ((__u32)( \
+               (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
+               (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
+               (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) | \
+               (((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
+#define ___constant_swab64(x) \
+       ((__u64)( \
+               (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
+               (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
+               (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
+               (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) | \
+               (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) | \
+               (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
+               (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
+               (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))
+
+/*
+ * provide defaults when no architecture-specific optimization is detected
+ */
+#ifndef __arch__swab16
+#  define __arch__swab16(x) ({ __u16 __tmp = (x) ; ___swab16(__tmp); })
+#endif
+#ifndef __arch__swab32
+#  define __arch__swab32(x) ({ __u32 __tmp = (x) ; ___swab32(__tmp); })
+#endif
+#ifndef __arch__swab64
+#  define __arch__swab64(x) ({ __u64 __tmp = (x) ; ___swab64(__tmp); })
+#endif
+
+#ifndef __arch__swab16p
+#  define __arch__swab16p(x) __arch__swab16(*(x))
+#endif
+#ifndef __arch__swab32p
+#  define __arch__swab32p(x) __arch__swab32(*(x))
+#endif
+#ifndef __arch__swab64p
+#  define __arch__swab64p(x) __arch__swab64(*(x))
+#endif
+
+#ifndef __arch__swab16s
+#  define __arch__swab16s(x) do { *(x) = __arch__swab16p((x)); } while (0)
+#endif
+#ifndef __arch__swab32s
+#  define __arch__swab32s(x) do { *(x) = __arch__swab32p((x)); } while (0)
+#endif
+#ifndef __arch__swab64s
+#  define __arch__swab64s(x) do { *(x) = __arch__swab64p((x)); } while (0)
+#endif
+
+
+/*
+ * Allow constant folding
+ */
+#  define __swab16(x) \
+(__builtin_constant_p((__u16)(x)) ? \
+ ___constant_swab16((x)) : \
+ __fswab16((x)))
+#  define __swab32(x) \
+(__builtin_constant_p((__u32)(x)) ? \
+ ___constant_swab32((x)) : \
+ __fswab32((x)))
+#  define __swab64(x) \
+(__builtin_constant_p((__u64)(x)) ? \
+ ___constant_swab64((x)) : \
+ __fswab64((x)))
+
+
+static __inline__ __u16 __fswab16(__u16 x)
+{
+       return (__extension__ __arch__swab16(x));
+}
+static __inline__ __u16 __swab16p(__u16 *x)
+{
+       return (__extension__ __arch__swab16p(x));
+}
+static __inline__ void __swab16s(__u16 *addr)
+{
+       (__extension__ ({__arch__swab16s(addr);}));
+}
+
+static __inline__ __u32 __fswab32(__u32 x)
+{
+       return (__extension__ __arch__swab32(x));
+}
+static __inline__ __u32 __swab32p(__u32 *x)
+{
+       return (__extension__ __arch__swab32p(x));
+}
+static __inline__ void __swab32s(__u32 *addr)
+{
+       (__extension__ ({__arch__swab32s(addr);}));
+}
+
+static __inline__ __u64 __fswab64(__u64 x)
+{
+#  ifdef __SWAB_64_THRU_32__
+       __u32 h = x >> 32;
+       __u32 l = x & ((1ULL<<32)-1);
+       return (((__u64)__swab32(l)) << 32) | ((__u64)(__swab32(h)));
+#  else
+       return (__extension__ __arch__swab64(x));
+#  endif
+}
+static __inline__ __u64 __swab64p(__u64 *x)
+{
+       return (__extension__ __arch__swab64p(x));
+}
+static __inline__ void __swab64s(__u64 *addr)
+{
+       (__extension__ ({__arch__swab64s(addr);}));
+}
+
 #ifdef XFS_NATIVE_HOST
 #define cpu_to_be16(val)       ((__force __be16)(__u16)(val))
 #define cpu_to_be32(val)       ((__force __be32)(__u32)(val))
@@ -71,4 +224,42 @@ static inline void be64_add_cpu(__be64 *a, __s64 b)
        *a = cpu_to_be64(be64_to_cpu(*a) + b);
 }
 
+static inline __uint16_t get_unaligned_be16(void *p)
+{
+       __uint8_t *__p = p;
+       return __p[0] << 8 | __p[1];
+}
+
+static inline __uint32_t get_unaligned_be32(void *p)
+{
+       __uint8_t *__p = p;
+        return __p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3];
+}
+
+static inline __uint64_t get_unaligned_be64(void *p)
+{
+       return (__uint64_t)get_unaligned_be32(p) << 32 |
+                          get_unaligned_be32(p + 4);
+}
+
+static inline void put_unaligned_be16(__uint16_t val, void *p)
+{
+       __uint8_t *__p = p;
+       *__p++ = val >> 8;
+       *__p++ = val;
+}
+
+static inline void put_unaligned_be32(__uint32_t val, void *p)
+{
+       __uint8_t *__p = p;
+       put_unaligned_be16(val >> 16, __p);
+       put_unaligned_be16(val, __p + 2);
+}
+
+static inline void put_unaligned_be64(__uint64_t val, void *p)
+{
+       put_unaligned_be32(val >> 32, p);
+       put_unaligned_be32(val, p + 4);
+}
+
 #endif /* __XFS_ARCH_H__ */

diff --git a/libxfs/crc32.c b/libxfs/crc32.c
index bc1fc98952d1d50754b3f126428f531e9c321988..63b1467fcedfb7fe4cd7e58c3f8d052d30857a1b 100644 (file)
--- a/libxfs/crc32.c
+++ b/libxfs/crc32.c
@@ -34,7 +34,6 @@
  */
 
 #include "xfs/platform_defs.h"
-#include "xfs/swab.h"
 #include "xfs/xfs_arch.h"
 #include "crc32defs.h"
 

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 72e124b23be43717233e8ff56c100a119ad796c8..445a6dc830e7dcb343929ff541a9f061b69e4016 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -66,7 +66,6 @@
 #include "xfs/bitops.h"
 #include "xfs/kmem.h"
 #include "xfs/radix-tree.h"
-#include "xfs/swab.h"
 #include "xfs/atomic.h"
 
 #include "xfs/xfs_types.h"