btrfs: Fix compilation on big endian systems
PATCH 1/1 btrfs: Fix compilation on big endian systems
Fix following two compile errors on big endian systems:
CC fs/btrfs/btrfs.o
In file included from include/linux/byteorder/big_endian.h:107,
from ./arch/powerpc/include/asm/byteorder.h:82,
from ./arch/powerpc/include/asm/bitops.h:8,
from include/linux/bitops.h:152,
from include/uuid.h:9,
from fs/btrfs/btrfs.c:10:
fs/btrfs/conv-funcs.h: In function ‘btrfs_key_to_disk’:
include/linux/byteorder/generic.h:90:21: error: ‘__cpu_to_le16’ undeclared (first use in this function); did you mean ‘__cpu_to_le16p’?
#define cpu_to_le16 __cpu_to_le16
^~~~~~~~~~~~~
fs/btrfs/conv-funcs.h:79:10: note: in expansion of macro ‘cpu_to_le16’
__u16: cpu_to_le16, \
^~~~~~~~~~~ CC fs/btrfs/compression.o
In file included from ./arch/powerpc/include/asm/unaligned.h:9,
from fs/btrfs/compression.c:16:include/linux/unaligned/access_ok.h:6:19: error: redefinition of ‘get_unaligned_le16’
static inline u16 get_unaligned_le16(const void *p)
^~~~~~~~~~~~~~~~~~
In file included from fs/btrfs/ctree.h:16,
from fs/btrfs/btrfs.h:12,
from fs/btrfs/compression.c:8:
include/linux/unaligned/le_byteshift.h:40:19: note: previous definition of ‘get_unaligned_le16’ was here
static inline u16 get_unaligned_le16(const void *p)
^~~~~~~~~~~~~~~~~~Include file asm/unaligned.h contains arch specific macros and functions for unaligned access as opposite to linux/unaligned le_byteshift.h which contains macros and functions specific to little endian systems only.
--- fs/btrfs/btrfs.h | 2 +- fs/btrfs/ctree.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/btrfs.h +1 -1
@@ -9,7 +9,7 @@#define __BTRFS_BTRFS_H__#include <linux/rbtree.h> -#include "conv-funcs.h" +#include "ctree.h" extern struct btrfs_info btrfs_info;extern struct btrfs_fs_info *current_fs_info;
fs/btrfs/ctree.h +1 -1
@@ -13,7 +13,7 @@#include <compiler.h> #include <linux/rbtree.h> #include <linux/bug.h> -#include <linux/unaligned/le_byteshift.h> +#include <asm/unaligned.h> #include <u-boot/crc.h> #include "kernel-shared/btrfs_tree.h" #include "crypto/hash.h"
Signature · 1 line
2.20.1
Quoted 30 lines · On Thu, 7 Apr 2022 14:51:03 +0200 Pali Rohár <[email protected]> wrote:
Fix following two compile errors on big endian systems:
CC
fs/btrfs/btrfs.o
In file included frominclude/linux/byteorder/big_endian.h:107,from ./arch/powerpc/include/asm/byteorder.h:82, from ./arch/powerpc/include/asm/bitops.h:8, from include/linux/bitops.h:152, from include/uuid.h:9, from fs/btrfs/btrfs.c:10: fs/btrfs/conv-funcs.h: In function ‘btrfs_key_to_disk’: include/linux/byteorder/generic.h:90:21: error: ‘__cpu_to_le16’ undeclared (first use in this function); did you mean ‘__cpu_to_le16p’? #define cpu_to_le16 __cpu_to_le16 ^~~~~~~~~~~~~ fs/btrfs/conv-funcs.h:79:10: note: in expansion of macro ‘cpu_to_le16’ __u16: cpu_to_le16, \ ^~~~~~~~~~~CC
fs/btrfs/compression.o
In file included from./arch/powerpc/include/asm/unaligned.h:9,
fromfs/btrfs/compression.c:16:include/linux/unaligned/access_ok.h:6:19: error: redefinition of ‘get_unaligned_le16’
static inline u16get_unaligned_le16(const void *p)^~~~~~~~~~~~~~~~~~ In file included from fs/btrfs/ctree.h:16, from fs/btrfs/btrfs.h:12, from fs/btrfs/compression.c:8: include/linux/unaligned/le_byteshift.h:40:19: note: previous definition of ‘get_unaligned_le16’ was here static inline u16 get_unaligned_le16(const void *p) ^~~~~~~~~~~~~~~~~~
Quoted 5 lines
Include file
asm/unaligned.hcontains arch specific macros and functions for unaligned access as opposite to linux/unalignedle_byteshift.hwhich contains macros and functions specific to little endian systems only.Signed-off-by Pali Rohár <[email protected]>
Quoted 30 lines · Pali Rohár
Fix following two compile errors on big endian systems:
CC
fs/btrfs/btrfs.o
In file included frominclude/linux/byteorder/big_endian.h:107,from ./arch/powerpc/include/asm/byteorder.h:82, from ./arch/powerpc/include/asm/bitops.h:8, from include/linux/bitops.h:152, from include/uuid.h:9, from fs/btrfs/btrfs.c:10: fs/btrfs/conv-funcs.h: In function ‘btrfs_key_to_disk’: include/linux/byteorder/generic.h:90:21: error: ‘__cpu_to_le16’ undeclared (first use in this function); did you mean ‘__cpu_to_le16p’? #define cpu_to_le16 __cpu_to_le16 ^~~~~~~~~~~~~ fs/btrfs/conv-funcs.h:79:10: note: in expansion of macro ‘cpu_to_le16’ __u16: cpu_to_le16, \ ^~~~~~~~~~~CC
fs/btrfs/compression.o
In file included from./arch/powerpc/include/asm/unaligned.h:9,
fromfs/btrfs/compression.c:16:include/linux/unaligned/access_ok.h:6:19: error: redefinition of ‘get_unaligned_le16’
static inline u16get_unaligned_le16(const void *p)^~~~~~~~~~~~~~~~~~ In file included from fs/btrfs/ctree.h:16, from fs/btrfs/btrfs.h:12, from fs/btrfs/compression.c:8: include/linux/unaligned/le_byteshift.h:40:19: note: previous definition of ‘get_unaligned_le16’ was here static inline u16 get_unaligned_le16(const void *p) ^~~~~~~~~~~~~~~~~~
Quoted 5 lines
Include file
asm/unaligned.hcontains arch specific macros and functions for unaligned access as opposite to linux/unalignedle_byteshift.hwhich contains macros and functions specific to little endian systems only.Signed-off-by Pali Rohár <[email protected]>
Thanks,
Qu
Quoted 31 lines
--- fs/btrfs/btrfs.h | 2 +- fs/btrfs/ctree.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)fs/btrfs/btrfs.h +1
-1@@ -9,7 +9,7 @@#define __BTRFS_BTRFS_H__#include <linux/rbtree.h> -#include "conv-funcs.h" +#include "ctree.h" extern struct btrfs_info btrfs_info;extern struct btrfs_fs_info *current_fs_info;fs/btrfs/ctree.h +1
-1@@ -13,7 +13,7 @@#include <compiler.h> #include <linux/rbtree.h> #include <linux/bug.h> -#include <linux/unaligned/le_byteshift.h> +#include <asm/unaligned.h> #include <u-boot/crc.h> #include "kernel-shared/btrfs_tree.h" #include "crypto/hash.h"
Quoted 30 lines · Pali Rohár
Fix following two compile errors on big endian systems:
CC
fs/btrfs/btrfs.o
In file included frominclude/linux/byteorder/big_endian.h:107,from ./arch/powerpc/include/asm/byteorder.h:82, from ./arch/powerpc/include/asm/bitops.h:8, from include/linux/bitops.h:152, from include/uuid.h:9, from fs/btrfs/btrfs.c:10: fs/btrfs/conv-funcs.h: In function ‘btrfs_key_to_disk’: include/linux/byteorder/generic.h:90:21: error: ‘__cpu_to_le16’ undeclared (first use in this function); did you mean ‘__cpu_to_le16p’? #define cpu_to_le16 __cpu_to_le16 ^~~~~~~~~~~~~ fs/btrfs/conv-funcs.h:79:10: note: in expansion of macro ‘cpu_to_le16’ __u16: cpu_to_le16, \ ^~~~~~~~~~~CC
fs/btrfs/compression.o
In file included from./arch/powerpc/include/asm/unaligned.h:9,
fromfs/btrfs/compression.c:16:include/linux/unaligned/access_ok.h:6:19: error: redefinition of ‘get_unaligned_le16’
static inline u16get_unaligned_le16(const void *p)^~~~~~~~~~~~~~~~~~ In file included from fs/btrfs/ctree.h:16, from fs/btrfs/btrfs.h:12, from fs/btrfs/compression.c:8: include/linux/unaligned/le_byteshift.h:40:19: note: previous definition of ‘get_unaligned_le16’ was here static inline u16 get_unaligned_le16(const void *p) ^~~~~~~~~~~~~~~~~~
Quoted 7 lines
Include file
asm/unaligned.hcontains arch specific macros and functions for unaligned access as opposite to linux/unalignedle_byteshift.hwhich contains macros and functions specific to little endian systems only.Signed-off-by Pali Rohár <[email protected]>Reviewed-by Marek Behún <[email protected]>Reviewed-by Qu Wenruo <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom