diff options
author | David Teigland <teigland@redhat.com> | 2015-05-22 13:25:33 -0500 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2015-05-29 15:55:48 -0500 |
commit | fc58ac1fe604ab7470d0010d99f42f17fc89b657 (patch) | |
tree | 6fd8f220a6326fefda939d28b1bf95974eb7c909 | |
parent | 27c695d0dfb9124a947ca0e5feeca954b391c527 (diff) | |
download | lvm2-fc58ac1fe604ab7470d0010d99f42f17fc89b657.tar.gz |
lvmlockd: use xlate.h for endian macros
and add the clearer macros to xlate.h
-rw-r--r-- | daemons/lvmlockd/lvmlockd-dlm.c | 1 | ||||
-rw-r--r-- | daemons/lvmlockd/lvmlockd-internal.h | 18 | ||||
-rw-r--r-- | daemons/lvmlockd/lvmlockd-sanlock.c | 1 | ||||
-rw-r--r-- | lib/mm/xlate.h | 82 |
4 files changed, 65 insertions, 37 deletions
diff --git a/daemons/lvmlockd/lvmlockd-dlm.c b/daemons/lvmlockd/lvmlockd-dlm.c index ffd7efd0c..b544bddc9 100644 --- a/daemons/lvmlockd/lvmlockd-dlm.c +++ b/daemons/lvmlockd/lvmlockd-dlm.c @@ -34,6 +34,7 @@ #include "configure.h" #include "daemon-server.h" #include "daemon-log.h" +#include "xlate.h" #include "lvmlockd-internal.h" #include "lvmlockd-client.h" diff --git a/daemons/lvmlockd/lvmlockd-internal.h b/daemons/lvmlockd/lvmlockd-internal.h index c24725ee2..6fa6ec799 100644 --- a/daemons/lvmlockd/lvmlockd-internal.h +++ b/daemons/lvmlockd/lvmlockd-internal.h @@ -236,24 +236,6 @@ int lm_get_lockspaces_sanlock(struct list_head *ls_rejoin); int lm_data_size_sanlock(void); int lm_is_running_sanlock(void); -#if __BYTE_ORDER == __BIG_ENDIAN -#define le16_to_cpu(x) (bswap_16((x))) -#define le32_to_cpu(x) (bswap_32((x))) -#define le64_to_cpu(x) (bswap_64((x))) -#define cpu_to_le16(x) (bswap_16((x))) -#define cpu_to_le32(x) (bswap_32((x))) -#define cpu_to_le64(x) (bswap_64((x))) -#endif - -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define le16_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le64_to_cpu(x) (x) -#define cpu_to_le16(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_le64(x) (x) -#endif - #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) diff --git a/daemons/lvmlockd/lvmlockd-sanlock.c b/daemons/lvmlockd/lvmlockd-sanlock.c index 94d2d5246..cd3954d94 100644 --- a/daemons/lvmlockd/lvmlockd-sanlock.c +++ b/daemons/lvmlockd/lvmlockd-sanlock.c @@ -29,6 +29,7 @@ #include "configure.h" #include "daemon-server.h" #include "daemon-log.h" +#include "xlate.h" #include "lvmlockd-internal.h" #include "lvmlockd-client.h" diff --git a/lib/mm/xlate.h b/lib/mm/xlate.h index 0d243c4c1..7354145f9 100644 --- a/lib/mm/xlate.h +++ b/lib/mm/xlate.h @@ -38,27 +38,71 @@ #endif #if BYTE_ORDER == LITTLE_ENDIAN -# define xlate16(x) (x) -# define xlate32(x) (x) -# define xlate64(x) (x) -# define xlate16_be(x) bswap_16(x) -# define xlate32_be(x) bswap_32(x) -# define xlate64_be(x) bswap_64(x) +/* Start using these variants because they are clearer. */ +#define le16_to_cpu(x) (x) +#define le32_to_cpu(x) (x) +#define le64_to_cpu(x) (x) +#define cpu_to_le16(x) (x) +#define cpu_to_le32(x) (x) +#define cpu_to_le64(x) (x) +#define be16_to_cpu(x) bswap_16(x) +#define be32_to_cpu(x) bswap_32(x) +#define be64_to_cpu(x) bswap_64(x) +#define cpu_to_be16(x) bswap_16(x) +#define cpu_to_be32(x) bswap_32(x) +#define cpu_to_be64(x) bswap_64(x) +/* Quit using these variants because they are unclear. */ +#define xlate16(x) (x) +#define xlate32(x) (x) +#define xlate64(x) (x) +#define xlate16_be(x) bswap_16(x) +#define xlate32_be(x) bswap_32(x) +#define xlate64_be(x) bswap_64(x) + #elif BYTE_ORDER == BIG_ENDIAN -# define xlate16(x) bswap_16(x) -# define xlate32(x) bswap_32(x) -# define xlate64(x) bswap_64(x) -# define xlate16_be(x) (x) -# define xlate32_be(x) (x) -# define xlate64_be(x) (x) +/* Start using these variants because they are clearer. */ +#define le16_to_cpu(x) bswap_16(x) +#define le32_to_cpu(x) bswap_32(x) +#define le64_to_cpu(x) bswap_64(x) +#define cpu_to_le16(x) bswap_16(x) +#define cpu_to_le32(x) bswap_32(x) +#define cpu_to_le64(x) bswap_64(x) +#define be16_to_cpu(x) (x) +#define be32_to_cpu(x) (x) +#define be64_to_cpu(x) (x) +#define cpu_to_be16(x) (x) +#define cpu_to_be32(x) (x) +#define cpu_to_be64(x) (x) +/* Quit using these variants because they are unclear. */ +#define xlate16(x) bswap_16(x) +#define xlate32(x) bswap_32(x) +#define xlate64(x) bswap_64(x) +#define xlate16_be(x) (x) +#define xlate32_be(x) (x) +#define xlate64_be(x) (x) + #else -# include <asm/byteorder.h> -# define xlate16(x) __cpu_to_le16((x)) -# define xlate32(x) __cpu_to_le32((x)) -# define xlate64(x) __cpu_to_le64((x)) -# define xlate16_be(x) __cpu_to_be16((x)) -# define xlate32_be(x) __cpu_to_be32((x)) -# define xlate64_be(x) __cpu_to_be64((x)) +#include <asm/byteorder.h> +/* Start using these variants because they are clearer. */ +#define le16_to_cpu(x) __le16_to_cpu(x) +#define le32_to_cpu(x) __le32_to_cpu(x) +#define le64_to_cpu(x) __le64_to_cpu(x) +#define cpu_to_le16(x) __cpu_to_le16(x) +#define cpu_to_le32(x) __cpu_to_le32(x) +#define cpu_to_le64(x) __cpu_to_le64(x) +#define be16_to_cpu(x) __be16_to_cpu(x) +#define be32_to_cpu(x) __be32_to_cpu(x) +#define be64_to_cpu(x) __be64_to_cpu(x) +#define cpu_to_be16(x) __cpu_to_be16(x) +#define cpu_to_be32(x) __cpu_to_be32(x) +#define cpu_to_be64(x) __cpu_to_be64(x) +/* Quit using these variants because they are unclear. */ +#define xlate16(x) __cpu_to_le16(x) +#define xlate32(x) __cpu_to_le32(x) +#define xlate64(x) __cpu_to_le64(x) +#define xlate16_be(x) __cpu_to_be16(x) +#define xlate32_be(x) __cpu_to_be32(x) +#define xlate64_be(x) __cpu_to_be64(x) #endif #endif |