e778d07c4c
Resolves: RHEL-86676, RHEL-72803, RHEL-88793, RHEL-88791 Signed-off-by: Xiao Ni <xni@redhat.com>
97 lines
3.3 KiB
Diff
97 lines
3.3 KiB
Diff
From 696207860f408534651db89c5b40133f5903fa25 Mon Sep 17 00:00:00 2001
|
|
From: Mariusz Tkaczyk <mtkaczyk@kernel.org>
|
|
Date: Fri, 7 Mar 2025 12:10:58 +0100
|
|
Subject: [PATCH 36/37] mdadm: include asm/byteorder.h
|
|
|
|
It will be included by raid/md_p.h anyway. Include it directly and
|
|
remove custom functions. It is not a problem now.
|
|
|
|
Signed-off-by: Mariusz Tkaczyk <mtkaczyk@kernel.org>
|
|
---
|
|
mdadm.h | 55 +------------------------------------------------------
|
|
1 file changed, 1 insertion(+), 54 deletions(-)
|
|
|
|
diff --git a/mdadm.h b/mdadm.h
|
|
index 592bd1ba..7471cedc 100644
|
|
--- a/mdadm.h
|
|
+++ b/mdadm.h
|
|
@@ -34,6 +34,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
|
|
#endif
|
|
|
|
#include <assert.h>
|
|
+#include <asm/byteorder.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <stdarg.h>
|
|
@@ -85,7 +86,6 @@ struct dlm_lksb {
|
|
#endif
|
|
|
|
#include <linux/kdev_t.h>
|
|
-/*#include <linux/fs.h> */
|
|
#include <sys/mount.h>
|
|
#include <asm/types.h>
|
|
#include <sys/ioctl.h>
|
|
@@ -169,59 +169,6 @@ struct dlm_lksb {
|
|
#include "msg.h"
|
|
#include "mdadm_status.h"
|
|
|
|
-#include <endian.h>
|
|
-/* Redhat don't like to #include <asm/byteorder.h>, and
|
|
- * some time include <linux/byteorder/xxx_endian.h> isn't enough,
|
|
- * and there is no standard conversion function so... */
|
|
-/* And dietlibc doesn't think byteswap is ok, so.. */
|
|
-/* #include <byteswap.h> */
|
|
-#define __mdadm_bswap_16(x) (((x) & 0x00ffU) << 8 | \
|
|
- ((x) & 0xff00U) >> 8)
|
|
-#define __mdadm_bswap_32(x) (((x) & 0x000000ffU) << 24 | \
|
|
- ((x) & 0xff000000U) >> 24 | \
|
|
- ((x) & 0x0000ff00U) << 8 | \
|
|
- ((x) & 0x00ff0000U) >> 8)
|
|
-#define __mdadm_bswap_64(x) (((x) & 0x00000000000000ffULL) << 56 | \
|
|
- ((x) & 0xff00000000000000ULL) >> 56 | \
|
|
- ((x) & 0x000000000000ff00ULL) << 40 | \
|
|
- ((x) & 0x00ff000000000000ULL) >> 40 | \
|
|
- ((x) & 0x0000000000ff0000ULL) << 24 | \
|
|
- ((x) & 0x0000ff0000000000ULL) >> 24 | \
|
|
- ((x) & 0x00000000ff000000ULL) << 8 | \
|
|
- ((x) & 0x000000ff00000000ULL) >> 8)
|
|
-
|
|
-#if BYTE_ORDER == LITTLE_ENDIAN
|
|
-#define __cpu_to_le16(_x) (unsigned int)(_x)
|
|
-#define __cpu_to_le32(_x) (unsigned int)(_x)
|
|
-#define __cpu_to_le64(_x) (unsigned long long)(_x)
|
|
-#define __le16_to_cpu(_x) (unsigned int)(_x)
|
|
-#define __le32_to_cpu(_x) (unsigned int)(_x)
|
|
-#define __le64_to_cpu(_x) (unsigned long long)(_x)
|
|
-
|
|
-#define __cpu_to_be16(_x) __mdadm_bswap_16(_x)
|
|
-#define __cpu_to_be32(_x) __mdadm_bswap_32(_x)
|
|
-#define __cpu_to_be64(_x) __mdadm_bswap_64(_x)
|
|
-#define __be16_to_cpu(_x) __mdadm_bswap_16(_x)
|
|
-#define __be32_to_cpu(_x) __mdadm_bswap_32(_x)
|
|
-#define __be64_to_cpu(_x) __mdadm_bswap_64(_x)
|
|
-#elif BYTE_ORDER == BIG_ENDIAN
|
|
-#define __cpu_to_le16(_x) __mdadm_bswap_16(_x)
|
|
-#define __cpu_to_le32(_x) __mdadm_bswap_32(_x)
|
|
-#define __cpu_to_le64(_x) __mdadm_bswap_64(_x)
|
|
-#define __le16_to_cpu(_x) __mdadm_bswap_16(_x)
|
|
-#define __le32_to_cpu(_x) __mdadm_bswap_32(_x)
|
|
-#define __le64_to_cpu(_x) __mdadm_bswap_64(_x)
|
|
-
|
|
-#define __cpu_to_be16(_x) (unsigned int)(_x)
|
|
-#define __cpu_to_be32(_x) (unsigned int)(_x)
|
|
-#define __cpu_to_be64(_x) (unsigned long long)(_x)
|
|
-#define __be16_to_cpu(_x) (unsigned int)(_x)
|
|
-#define __be32_to_cpu(_x) (unsigned int)(_x)
|
|
-#define __be64_to_cpu(_x) (unsigned long long)(_x)
|
|
-#else
|
|
-# error "unknown endianness."
|
|
-#endif
|
|
-
|
|
/*
|
|
* Partially stolen from include/linux/unaligned/packed_struct.h
|
|
*/
|
|
--
|
|
2.41.0
|
|
|