diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-12-24 14:28:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 16:15:33 -0700 |
| commit | a9721f3152bc2be6702807705902e06abdd6e3bb (patch) | |
| tree | 4f01e2f3426697787330371ab822e7e60bc2238e /fs/befs/endian.h | |
| parent | e5201c58cd81066ecd0210bcc6c02e71200040a3 (diff) | |
| download | kernel_samsung_aries-a9721f3152bc2be6702807705902e06abdd6e3bb.zip kernel_samsung_aries-a9721f3152bc2be6702807705902e06abdd6e3bb.tar.gz kernel_samsung_aries-a9721f3152bc2be6702807705902e06abdd6e3bb.tar.bz2 | |
[PATCH] befs: endianness annotations
split the data structures that exist in host- and disk-endian variants,
annotate the fields of disk-endian ones, propagate changes.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/befs/endian.h')
| -rw-r--r-- | fs/befs/endian.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/befs/endian.h b/fs/befs/endian.h index 979c543..e254a20 100644 --- a/fs/befs/endian.h +++ b/fs/befs/endian.h @@ -68,26 +68,26 @@ cpu_to_fs16(const struct super_block *sb, u16 n) /* Composite types below here */ static inline befs_block_run -fsrun_to_cpu(const struct super_block *sb, befs_block_run n) +fsrun_to_cpu(const struct super_block *sb, befs_disk_block_run n) { 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); + run.allocation_group = le32_to_cpu((__force __le32)n.allocation_group); + run.start = le16_to_cpu((__force __le16)n.start); + run.len = le16_to_cpu((__force __le16)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 = be32_to_cpu((__force __be32)n.allocation_group); + run.start = be16_to_cpu((__force __be16)n.start); + run.len = be16_to_cpu((__force __be16)n.len); } return run; } -static inline befs_block_run +static inline befs_disk_block_run cpu_to_fsrun(const struct super_block *sb, befs_block_run n) { - befs_block_run run; + befs_disk_block_run run; if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) { run.allocation_group = cpu_to_le32(n.allocation_group); @@ -102,7 +102,7 @@ cpu_to_fsrun(const struct super_block *sb, befs_block_run n) } static inline befs_data_stream -fsds_to_cpu(const struct super_block *sb, befs_data_stream n) +fsds_to_cpu(const struct super_block *sb, befs_disk_data_stream n) { befs_data_stream data; int i; |