diff --git a/scst/include/backport.h b/scst/include/backport.h index 8e1a6afa0..c7c923eae 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -631,6 +631,40 @@ static inline void *vzalloc(unsigned long size) } #endif +/* */ + +#if defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5 +static inline uint16_t get_unaligned_be16(const void *p) +{ + return be16_to_cpu(get_unaligned((__be16 *)p)); +} + +static inline void put_unaligned_be16(uint16_t i, void *p) +{ + put_unaligned(cpu_to_be16(i), (__be16 *)p); +} + +static inline uint32_t get_unaligned_be32(const void *p) +{ + return be32_to_cpu(get_unaligned((__be32 *)p)); +} + +static inline void put_unaligned_be32(uint32_t i, void *p) +{ + put_unaligned(cpu_to_be32(i), (__be32 *)p); +} + +static inline uint64_t get_unaligned_be64(const void *p) +{ + return be64_to_cpu(get_unaligned((__be64 *)p)); +} + +static inline void put_unaligned_be64(uint64_t i, void *p) +{ + put_unaligned(cpu_to_be64(i), (__be64 *)p); +} +#endif + /* */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) diff --git a/scst/include/scst.h b/scst/include/scst.h index 215800533..797d756f2 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -4656,38 +4656,6 @@ static inline __be16 scst_cmd_get_dif_app_tag(struct scst_cmd *cmd, return cmd->dev->dev_dif_static_app_tag; } -#if defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5 -static inline uint16_t get_unaligned_be16(const void *p) -{ - return be16_to_cpu(get_unaligned((__be16 *)p)); -} - -static inline void put_unaligned_be16(uint16_t i, void *p) -{ - put_unaligned(cpu_to_be16(i), (__be16 *)p); -} - -static inline uint32_t get_unaligned_be32(const void *p) -{ - return be32_to_cpu(get_unaligned((__be32 *)p)); -} - -static inline void put_unaligned_be32(uint32_t i, void *p) -{ - put_unaligned(cpu_to_be32(i), (__be32 *)p); -} - -static inline uint64_t get_unaligned_be64(const void *p) -{ - return be64_to_cpu(get_unaligned((__be64 *)p)); -} - -static inline void put_unaligned_be64(uint64_t i, void *p) -{ - put_unaligned(cpu_to_be64(i), (__be64 *)p); -} -#endif - /* * Returns T10-PI type 2 expected initial reference tag as LBA, i.e. converted * into CPU endianness. Valid only with protection type 2.