befs: introduce on-disk endian types
PATCH 6/16 befs: introduce on-disk endian types
Date: Sat, 24 Dec 2005 01:32:03 -0500
Signed-off-by Al Viro <[email protected]>
--- fs/befs/befs_fs_types.h | 4 ++++ fs/befs/endian.h | 36 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 18 deletions(-)
fs/befs/befs_fs_types.h +4 -0
@@ -79,6 +79,10 @@ enum inode_flags {* On-Disk datastructures of BeFS */ +typedef u64 __bitwise fs64 ; +typedef u32 __bitwise fs32 ; +typedef u16 __bitwise fs16 ; +typedef u64 befs_off_t ;typedef u64 befs_time_t ;
fs/befs/endian.h +18 -18
@@ -12,57 +12,57 @@ #define LINUX_BEFS_ENDIAN#include <linux/byteorder/generic.h> static inline u64 -fs64_to_cpu (const struct super_block *sb,u64 n) +fs64_to_cpu (const struct super_block *sb,fs64 n) {if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) -return le64_to_cpu (n); +return le64_to_cpu ((__force __le64 )n);else -return be64_to_cpu (n); +return be64_to_cpu ((__force __be64 )n); } -static inline u64 +static inline fs64 cpu_to_fs64 (const struct super_block *sb,u64 n) {if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) -return cpu_to_le64 (n); +return (__force fs64 )cpu_to_le64 (n);else -return cpu_to_be64 (n); +return (__force fs64 )cpu_to_be64 (n); }static inline u32 -fs32_to_cpu (const struct super_block *sb,u32 n) +fs32_to_cpu (const struct super_block *sb,fs32 n) {if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) -return le32_to_cpu (n); +return le32_to_cpu ((__force __le32 )n);else -return be32_to_cpu (n); +return be32_to_cpu ((__force __be32 )n); } -static inline u32 +static inline fs32 cpu_to_fs32 (const struct super_block *sb,u32 n) {if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) -return cpu_to_le32 (n); +return (__force fs32 )cpu_to_le32 (n);else -return cpu_to_be32 (n); +return (__force fs32 )cpu_to_be32 (n); }static inline u16 -fs16_to_cpu (const struct super_block *sb,u16 n) +fs16_to_cpu (const struct super_block *sb,fs16 n) {if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) -return le16_to_cpu (n); +return le16_to_cpu ((__force __le16 )n);else -return be16_to_cpu (n); +return be16_to_cpu ((__force __be16 )n); } -static inline u16 +static inline fs16 cpu_to_fs16 (const struct super_block *sb,u16 n) {if (BEFS_SB (sb)->byte_order ==BEFS_BYTESEX_LE ) -return cpu_to_le16 (n); +return (__force fs16 )cpu_to_le16 (n);else -return cpu_to_be16 (n); +return (__force fs16 )cpu_to_be16 (n); }/* Composite types below here */
Signature · 1 line
1.4.2.GIT