From: Alexey Dobriyan <[email protected]>
Signed-off-by: Alexey Dobriyan <[email protected]>
Signed-off-by: Domen Puncer <[email protected]>
---
endian.h | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
Index: quilt/fs/befs/endian.h
===================================================================
--- quilt.orig/fs/befs/endian.h
+++ quilt/fs/befs/endian.h
@@ -16,9 +16,9 @@ static inline u64
fs64_to_cpu(const struct super_block *sb, u64 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
- return le64_to_cpu(n);
+ return le64_to_cpu((__le64 __force) n);
else
- return be64_to_cpu(n);
+ return be64_to_cpu((__be64 __force) n);
}
static inline u64
@@ -34,9 +34,9 @@ static inline u32
fs32_to_cpu(const struct super_block *sb, u32 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
- return le32_to_cpu(n);
+ return le32_to_cpu((__le32 __force) n);
else
- return be32_to_cpu(n);
+ return be32_to_cpu((__be32 __force) n);
}
static inline u32
@@ -52,9 +52,9 @@ static inline u16
fs16_to_cpu(const struct super_block *sb, u16 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
- return le16_to_cpu(n);
+ return le16_to_cpu((__le16 __force) n);
else
- return be16_to_cpu(n);
+ return be16_to_cpu((__be16 __force) n);
}
static inline u16
@@ -73,15 +73,9 @@ fsrun_to_cpu(const struct super_block *s
{
befs_block_run run;
- if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) {
- run.allocation_group = le32_to_cpu(n.allocation_group);
- run.start = le16_to_cpu(n.start);
- run.len = le16_to_cpu(n.len);
- } else {
- run.allocation_group = be32_to_cpu(n.allocation_group);
- run.start = be16_to_cpu(n.start);
- run.len = be16_to_cpu(n.len);
- }
+ run.allocation_group = fs32_to_cpu(sb, n.allocation_group);
+ run.start = fs16_to_cpu(sb, n.start);
+ run.len = fs16_to_cpu(sb, n.len);
return run;
}
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
