git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
fs
/
ufs
/
swab.h
diff --git
a/fs/ufs/swab.h
b/fs/ufs/swab.h
index
a19000f
..
1683d2b
100644
(file)
--- a/
fs/ufs/swab.h
+++ b/
fs/ufs/swab.h
@@
-22,22
+22,22
@@
enum {
BYTESEX_BE
};
BYTESEX_BE
};
-static
__
inline u64
-fs64_to_cpu(struct super_block *sbp,
u
64 n)
+static inline u64
+fs64_to_cpu(struct super_block *sbp,
__fs
64 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
- return le64_to_cpu(n);
+ return le64_to_cpu(
(__force __le64)
n);
else
else
- return be64_to_cpu(n);
+ return be64_to_cpu(
(__force __be64)
n);
}
}
-static
__inline u
64
+static
inline __fs
64
cpu_to_fs64(struct super_block *sbp, u64 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
cpu_to_fs64(struct super_block *sbp, u64 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
- return cpu_to_le64(n);
+ return
(__force __fs64)
cpu_to_le64(n);
else
else
- return cpu_to_be64(n);
+ return
(__force __fs64)
cpu_to_be64(n);
}
static __inline u32
}
static __inline u32
@@
-59,75
+59,75
@@
fs64_sub(struct super_block *sbp, u32 *n, int d)
}
static __inline u32
}
static __inline u32
-fs32_to_cpu(struct super_block *sbp,
u
32 n)
+fs32_to_cpu(struct super_block *sbp,
__fs
32 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
- return le32_to_cpu(n);
+ return le32_to_cpu(
(__force __le32)
n);
else
else
- return be32_to_cpu(n);
+ return be32_to_cpu(
(__force __be32)
n);
}
}
-static
__inline u
32
+static
inline __fs
32
cpu_to_fs32(struct super_block *sbp, u32 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
cpu_to_fs32(struct super_block *sbp, u32 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
- return cpu_to_le32(n);
+ return
(__force __fs32)
cpu_to_le32(n);
else
else
- return cpu_to_be32(n);
+ return
(__force __fs32)
cpu_to_be32(n);
}
}
-static
__inline u32
-fs32_add(struct super_block *sbp,
u
32 *n, int d)
+static
inline void
+fs32_add(struct super_block *sbp,
__fs
32 *n, int d)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
-
return *n = cpu_to_le32(le32_to_cpu(*
n)+d);
+
*(__le32 *)n = cpu_to_le32(le32_to_cpu(*(__le32 *)
n)+d);
else
else
-
return *n = cpu_to_be32(be32_to_cpu(*
n)+d);
+
*(__be32 *)n = cpu_to_be32(be32_to_cpu(*(__be32 *)
n)+d);
}
}
-static
__inline u32
-fs32_sub(struct super_block *sbp,
u
32 *n, int d)
+static
inline void
+fs32_sub(struct super_block *sbp,
__fs
32 *n, int d)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
-
return *n = cpu_to_le32(le32_to_cpu(*
n)-d);
+
*(__le32 *)n = cpu_to_le32(le32_to_cpu(*(__le32 *)
n)-d);
else
else
-
return *n = cpu_to_be32(be32_to_cpu(*
n)-d);
+
*(__be32 *)n = cpu_to_be32(be32_to_cpu(*(__be32 *)
n)-d);
}
}
-static
__
inline u16
-fs16_to_cpu(struct super_block *sbp,
u
16 n)
+static inline u16
+fs16_to_cpu(struct super_block *sbp,
__fs
16 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
- return le16_to_cpu(n);
+ return le16_to_cpu(
(__force __le16)
n);
else
else
- return be16_to_cpu(n);
+ return be16_to_cpu(
(__force __be16)
n);
}
}
-static
__inline u
16
+static
inline __fs
16
cpu_to_fs16(struct super_block *sbp, u16 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
cpu_to_fs16(struct super_block *sbp, u16 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
- return cpu_to_le16(n);
+ return
(__force __fs16)
cpu_to_le16(n);
else
else
- return cpu_to_be16(n);
+ return
(__force __fs16)
cpu_to_be16(n);
}
}
-static
__inline u16
-fs16_add(struct super_block *sbp,
u
16 *n, int d)
+static
inline void
+fs16_add(struct super_block *sbp,
__fs
16 *n, int d)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
-
return *n = cpu_to_le16(le16_to_cpu(*
n)+d);
+
*(__le16 *)n = cpu_to_le16(le16_to_cpu(*(__le16 *)
n)+d);
else
else
-
return *n = cpu_to_be16(be16_to_cpu(*
n)+d);
+
*(__be16 *)n = cpu_to_be16(be16_to_cpu(*(__be16 *)
n)+d);
}
}
-static
__inline u16
-fs16_sub(struct super_block *sbp,
u
16 *n, int d)
+static
inline void
+fs16_sub(struct super_block *sbp,
__fs
16 *n, int d)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
-
return *n = cpu_to_le16(le16_to_cpu(*
n)-d);
+
*(__le16 *)n = cpu_to_le16(le16_to_cpu(*(__le16 *)
n)-d);
else
else
-
return *n = cpu_to_be16(be16_to_cpu(*
n)-d);
+
*(__be16 *)n = cpu_to_be16(be16_to_cpu(*(__be16 *)
n)-d);
}
#endif /* _UFS_SWAB_H */
}
#endif /* _UFS_SWAB_H */