[PATCH] isofs endianness annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c
index 877b4e47d76a7bbb6cba0d68c9c83556ec34abba..0b5a3a0ed767143535d6ed666c0da838d0b283cd 100644 (file)
--- a/fs/isofs/compress.c
+++ b/fs/isofs/compress.c
@@ -132,7 +132,7 @@ static int zisofs_readpage(struct file *file, struct page *page)
                        brelse(ptrbh[1]);
                goto eio;
        }
-       cstart = le32_to_cpu(*(u32 *)(bh->b_data + (blockptr & bufmask)));
+       cstart = le32_to_cpu(*(__le32 *)(bh->b_data + (blockptr & bufmask)));
 
        if ( indexblocks == 2 ) {
                /* We just crossed a block boundary.  Switch to the next block */
@@ -144,7 +144,7 @@ static int zisofs_readpage(struct file *file, struct page *page)
                        goto eio;
                }
        }
-       cend = le32_to_cpu(*(u32 *)(bh->b_data + (blockendptr & bufmask)));
+       cend = le32_to_cpu(*(__le32 *)(bh->b_data + (blockendptr & bufmask)));
        brelse(bh);
 
        csize = cend-cstart;

diff --git a/include/linux/iso_fs.h b/include/linux/iso_fs.h
index dd53b6cd217354318905d5630f1f2436d169540c..099039d4b10da9ec8dab7fad3a82ae1881ed9713 100644 (file)
--- a/include/linux/iso_fs.h
+++ b/include/linux/iso_fs.h
@@ -192,29 +192,29 @@ static inline int isonum_712(char *p)
 }
 static inline unsigned int isonum_721(char *p)
 {
-       return le16_to_cpu(get_unaligned((u16 *)p));
+       return le16_to_cpu(get_unaligned((__le16 *)p));
 }
 static inline unsigned int isonum_722(char *p)
 {
-       return be16_to_cpu(get_unaligned((u16 *)p));
+       return be16_to_cpu(get_unaligned((__le16 *)p));
 }
 static inline unsigned int isonum_723(char *p)
 {
        /* Ignore bigendian datum due to broken mastering programs */
-       return le16_to_cpu(get_unaligned((u16 *)p));
+       return le16_to_cpu(get_unaligned((__le16 *)p));
 }
 static inline unsigned int isonum_731(char *p)
 {
-       return le32_to_cpu(get_unaligned((u32 *)p));
+       return le32_to_cpu(get_unaligned((__le32 *)p));
 }
 static inline unsigned int isonum_732(char *p)
 {
-       return be32_to_cpu(get_unaligned((u32 *)p));
+       return be32_to_cpu(get_unaligned((__le32 *)p));
 }
 static inline unsigned int isonum_733(char *p)
 {
        /* Ignore bigendian datum due to broken mastering programs */
-       return le32_to_cpu(get_unaligned((u32 *)p));
+       return le32_to_cpu(get_unaligned((__le32 *)p));
 }
 extern int iso_date(char *, int);