Commit f016bad6 authored by Nathan Scott's avatar Nathan Scott

[XFS] Cleanup some -Wundef flag warnings in the endian macros (thanks

Christoph).

SGI-PV: 942400
SGI-Modid: xfs-linux-melb:xfs-kern:23771a
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent caf39e87
...@@ -40,22 +40,28 @@ ...@@ -40,22 +40,28 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#ifdef __LITTLE_ENDIAN
# define __BYTE_ORDER __LITTLE_ENDIAN
#endif
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
# define __BYTE_ORDER __BIG_ENDIAN #define XFS_NATIVE_HOST 1
#else
#undef XFS_NATIVE_HOST
#endif
#else /* __KERNEL__ */
#if __BYTE_ORDER == __BIG_ENDIAN
#define XFS_NATIVE_HOST 1
#else
#undef XFS_NATIVE_HOST
#endif #endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
/* do we need conversion? */ /* do we need conversion? */
#define ARCH_NOCONVERT 1 #define ARCH_NOCONVERT 1
#if __BYTE_ORDER == __LITTLE_ENDIAN #ifdef XFS_NATIVE_HOST
# define ARCH_CONVERT 0
#else
# define ARCH_CONVERT ARCH_NOCONVERT # define ARCH_CONVERT ARCH_NOCONVERT
#else
# define ARCH_CONVERT 0
#endif #endif
/* generic swapping macros */ /* generic swapping macros */
......
...@@ -2017,7 +2017,7 @@ xfs_bmbt_get_state( ...@@ -2017,7 +2017,7 @@ xfs_bmbt_get_state(
ext_flag); ext_flag);
} }
#if __BYTE_ORDER != __BIG_ENDIAN #ifndef XFS_NATIVE_HOST
/* Endian flipping versions of the bmbt extraction functions */ /* Endian flipping versions of the bmbt extraction functions */
void void
xfs_bmbt_disk_get_all( xfs_bmbt_disk_get_all(
...@@ -2087,7 +2087,7 @@ xfs_bmbt_disk_get_state( ...@@ -2087,7 +2087,7 @@ xfs_bmbt_disk_get_state(
return xfs_extent_state(xfs_bmbt_disk_get_blockcount(r), return xfs_extent_state(xfs_bmbt_disk_get_blockcount(r),
ext_flag); ext_flag);
} }
#endif #endif /* XFS_NATIVE_HOST */
/* /*
...@@ -2531,7 +2531,7 @@ xfs_bmbt_set_allf( ...@@ -2531,7 +2531,7 @@ xfs_bmbt_set_allf(
#endif /* XFS_BIG_BLKNOS */ #endif /* XFS_BIG_BLKNOS */
} }
#if __BYTE_ORDER != __BIG_ENDIAN #ifndef XFS_NATIVE_HOST
/* /*
* Set all the fields in a bmap extent record from the uncompressed form. * Set all the fields in a bmap extent record from the uncompressed form.
*/ */
...@@ -2617,7 +2617,7 @@ xfs_bmbt_disk_set_allf( ...@@ -2617,7 +2617,7 @@ xfs_bmbt_disk_set_allf(
} }
#endif /* XFS_BIG_BLKNOS */ #endif /* XFS_BIG_BLKNOS */
} }
#endif #endif /* XFS_NATIVE_HOST */
/* /*
* Set the blockcount field in a bmap extent record. * Set the blockcount field in a bmap extent record.
......
...@@ -62,7 +62,7 @@ typedef struct xfs_bmdr_block ...@@ -62,7 +62,7 @@ typedef struct xfs_bmdr_block
* l1:0-20 are blockcount. * l1:0-20 are blockcount.
*/ */
#if __BYTE_ORDER == __LITTLE_ENDIAN #ifndef XFS_NATIVE_HOST
#define BMBT_TOTAL_BITLEN 128 /* 128 bits, 16 bytes */ #define BMBT_TOTAL_BITLEN 128 /* 128 bits, 16 bytes */
#define BMBT_EXNTFLAG_BITOFF 0 #define BMBT_EXNTFLAG_BITOFF 0
...@@ -87,7 +87,7 @@ typedef struct xfs_bmdr_block ...@@ -87,7 +87,7 @@ typedef struct xfs_bmdr_block
#define BMBT_BLOCKCOUNT_BITOFF 64 /* Start of second 64 bit container */ #define BMBT_BLOCKCOUNT_BITOFF 64 /* Start of second 64 bit container */
#define BMBT_BLOCKCOUNT_BITLEN 21 #define BMBT_BLOCKCOUNT_BITLEN 21
#endif #endif /* XFS_NATIVE_HOST */
#define BMBT_USE_64 1 #define BMBT_USE_64 1
...@@ -505,7 +505,7 @@ xfs_exntst_t ...@@ -505,7 +505,7 @@ xfs_exntst_t
xfs_bmbt_get_state( xfs_bmbt_get_state(
xfs_bmbt_rec_t *r); xfs_bmbt_rec_t *r);
#if __BYTE_ORDER != __BIG_ENDIAN #ifndef XFS_NATIVE_HOST
void void
xfs_bmbt_disk_get_all( xfs_bmbt_disk_get_all(
xfs_bmbt_rec_t *r, xfs_bmbt_rec_t *r,
...@@ -538,7 +538,7 @@ xfs_bmbt_disk_get_startoff( ...@@ -538,7 +538,7 @@ xfs_bmbt_disk_get_startoff(
xfs_bmbt_get_blockcount(r) xfs_bmbt_get_blockcount(r)
#define xfs_bmbt_disk_get_startoff(r) \ #define xfs_bmbt_disk_get_startoff(r) \
xfs_bmbt_get_startoff(r) xfs_bmbt_get_startoff(r)
#endif #endif /* XFS_NATIVE_HOST */
int int
xfs_bmbt_increment( xfs_bmbt_increment(
...@@ -623,7 +623,7 @@ xfs_bmbt_set_state( ...@@ -623,7 +623,7 @@ xfs_bmbt_set_state(
xfs_bmbt_rec_t *r, xfs_bmbt_rec_t *r,
xfs_exntst_t v); xfs_exntst_t v);
#if __BYTE_ORDER != __BIG_ENDIAN #ifndef XFS_NATIVE_HOST
void void
xfs_bmbt_disk_set_all( xfs_bmbt_disk_set_all(
xfs_bmbt_rec_t *r, xfs_bmbt_rec_t *r,
...@@ -641,7 +641,7 @@ xfs_bmbt_disk_set_allf( ...@@ -641,7 +641,7 @@ xfs_bmbt_disk_set_allf(
xfs_bmbt_set_all(r, s) xfs_bmbt_set_all(r, s)
#define xfs_bmbt_disk_set_allf(r, o, b, c, v) \ #define xfs_bmbt_disk_set_allf(r, o, b, c, v) \
xfs_bmbt_set_allf(r, o, b, c, v) xfs_bmbt_set_allf(r, o, b, c, v)
#endif #endif /* XFS_NATIVE_HOST */
void void
xfs_bmbt_to_bmdr( xfs_bmbt_to_bmdr(
......
...@@ -127,13 +127,13 @@ typedef union { ...@@ -127,13 +127,13 @@ typedef union {
* Watch the order here (endian-ness dependent). * Watch the order here (endian-ness dependent).
*/ */
struct { struct {
#if __BYTE_ORDER == __LITTLE_ENDIAN #ifndef XFS_NATIVE_HOST
xfs_dahash_t h; /* hash value */ xfs_dahash_t h; /* hash value */
__uint32_t be; /* block and entry */ __uint32_t be; /* block and entry */
#else /* __BYTE_ORDER == __BIG_ENDIAN */ #else
__uint32_t be; /* block and entry */ __uint32_t be; /* block and entry */
xfs_dahash_t h; /* hash value */ xfs_dahash_t h; /* hash value */
#endif /* __BYTE_ORDER == __BIG_ENDIAN */ #endif /* XFS_NATIVE_HOST */
} s; } s;
} xfs_dircook_t; } xfs_dircook_t;
......
...@@ -341,7 +341,7 @@ xfs_inode_item_format( ...@@ -341,7 +341,7 @@ xfs_inode_item_format(
nrecs = ip->i_df.if_bytes / nrecs = ip->i_df.if_bytes /
(uint)sizeof(xfs_bmbt_rec_t); (uint)sizeof(xfs_bmbt_rec_t);
ASSERT(nrecs > 0); ASSERT(nrecs > 0);
#if __BYTE_ORDER == __BIG_ENDIAN #ifdef XFS_NATIVE_HOST
if (nrecs == ip->i_d.di_nextents) { if (nrecs == ip->i_d.di_nextents) {
/* /*
* There are no delayed allocation * There are no delayed allocation
...@@ -473,7 +473,7 @@ xfs_inode_item_format( ...@@ -473,7 +473,7 @@ xfs_inode_item_format(
#endif #endif
ASSERT(nrecs > 0); ASSERT(nrecs > 0);
ASSERT(nrecs == ip->i_d.di_anextents); ASSERT(nrecs == ip->i_d.di_anextents);
#if __BYTE_ORDER == __BIG_ENDIAN #ifdef XFS_NATIVE_HOST
/* /*
* There are not delayed allocation extents * There are not delayed allocation extents
* for attributes, so just point at the array. * for attributes, so just point at the array.
......
...@@ -112,7 +112,7 @@ struct xfs_mount; ...@@ -112,7 +112,7 @@ struct xfs_mount;
* this has endian issues, of course. * this has endian issues, of course.
*/ */
#if __BYTE_ORDER == __LITTLE_ENDIAN #ifndef XFS_NATIVE_HOST
#define GET_CLIENT_ID(i,arch) \ #define GET_CLIENT_ID(i,arch) \
((i) & 0xff) ((i) & 0xff)
#else #else
...@@ -414,14 +414,10 @@ typedef struct xlog_op_header { ...@@ -414,14 +414,10 @@ typedef struct xlog_op_header {
#define XLOG_FMT_IRIX_BE 3 #define XLOG_FMT_IRIX_BE 3
/* our fmt */ /* our fmt */
#if __BYTE_ORDER == __LITTLE_ENDIAN #ifdef XFS_NATIVE_HOST
#define XLOG_FMT XLOG_FMT_LINUX_LE
#else
#if __BYTE_ORDER == __BIG_ENDIAN
#define XLOG_FMT XLOG_FMT_LINUX_BE #define XLOG_FMT XLOG_FMT_LINUX_BE
#else #else
#error unknown byte order #define XLOG_FMT XLOG_FMT_LINUX_LE
#endif
#endif #endif
typedef struct xlog_rec_header { typedef struct xlog_rec_header {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment