ext4: fix miscellaneous big endian warnings

None of these result in any bug, but they makes sparse complain.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 3825d6aa8336aa0bbcda8f303f299f24dc8bb67e..45a5ca89797fcdd663d831e7c3b8ce088778a9d9 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -416,15 +416,16 @@ static __le32 ext4_dx_csum(struct inode *inode, struct ext4_dir_entry *dirent,
 {
        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
        struct ext4_inode_info *ei = EXT4_I(inode);
-       __u32 csum, old_csum;
+       __u32 csum;
+       __le32 save_csum;
        int size;
 
        size = count_offset + (count * sizeof(struct dx_entry));
-       old_csum = t->dt_checksum;
+       save_csum = t->dt_checksum;
        t->dt_checksum = 0;
        csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)dirent, size);
        csum = ext4_chksum(sbi, csum, (__u8 *)t, sizeof(struct dx_tail));
-       t->dt_checksum = old_csum;
+       t->dt_checksum = save_csum;
 
        return cpu_to_le32(csum);
 }

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6fea87db7daa4696e1781a2817fbd6ff61d14673..f355c28fa0804fc5cc23b263bb25550484c51d79 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1952,16 +1952,16 @@ static __le16 ext4_group_desc_csum(struct ext4_sb_info *sbi, __u32 block_group,
        if ((sbi->s_es->s_feature_ro_compat &
             cpu_to_le32(EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))) {
                /* Use new metadata_csum algorithm */
-               __u16 old_csum;
+               __le16 save_csum;
                __u32 csum32;
 
-               old_csum = gdp->bg_checksum;
+               save_csum = gdp->bg_checksum;
                gdp->bg_checksum = 0;
                csum32 = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&le_group,
                                     sizeof(le_group));
                csum32 = ext4_chksum(sbi, csum32, (__u8 *)gdp,
                                     sbi->s_desc_size);
-               gdp->bg_checksum = old_csum;
+               gdp->bg_checksum = save_csum;
 
                crc = csum32 & 0xFFFF;
                goto out;

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 3a120b277240e70b44fede9fa0b9ffa98b85118b..c081e34f717f6903492acd3c4bc92d26dc888e7e 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -122,17 +122,18 @@ static __le32 ext4_xattr_block_csum(struct inode *inode,
                                    struct ext4_xattr_header *hdr)
 {
        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
-       __u32 csum, old;
+       __u32 csum;
+       __le32 save_csum;
+       __le64 dsk_block_nr = cpu_to_le64(block_nr);
 
-       old = hdr->h_checksum;
+       save_csum = hdr->h_checksum;
        hdr->h_checksum = 0;
-       block_nr = cpu_to_le64(block_nr);
-       csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&block_nr,
-                          sizeof(block_nr));
+       csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&dsk_block_nr,
+                          sizeof(dsk_block_nr));
        csum = ext4_chksum(sbi, csum, (__u8 *)hdr,
                           EXT4_BLOCK_SIZE(inode->i_sb));
 
-       hdr->h_checksum = old;
+       hdr->h_checksum = save_csum;
        return cpu_to_le32(csum);
 }
 

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 58459b78556565ed2b8526300d5c4f81075c0d76..d0e686402df883d89e474a63374cdd1aa4c73ba6 100644 (file)
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -1948,7 +1948,7 @@ TRACE_EVENT(ext4_remove_blocks,
                __entry->to             = to;
                __entry->partial        = partial_cluster;
                __entry->ee_pblk        = ext4_ext_pblock(ex);
-               __entry->ee_lblk        = cpu_to_le32(ex->ee_block);
+               __entry->ee_lblk        = le32_to_cpu(ex->ee_block);
                __entry->ee_len         = ext4_ext_get_actual_len(ex);
        ),
 
@@ -2052,7 +2052,7 @@ TRACE_EVENT(ext4_ext_remove_space,
 
 TRACE_EVENT(ext4_ext_remove_space_done,
        TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth,
-               ext4_lblk_t partial, unsigned short eh_entries),
+               ext4_lblk_t partial, __le16 eh_entries),
 
        TP_ARGS(inode, start, depth, partial, eh_entries),
 
@@ -2071,7 +2071,7 @@ TRACE_EVENT(ext4_ext_remove_space_done,
                __entry->start          = start;
                __entry->depth          = depth;
                __entry->partial        = partial;
-               __entry->eh_entries     = eh_entries;
+               __entry->eh_entries     = le16_to_cpu(eh_entries);
        ),
 
        TP_printk("dev %d,%d ino %lu since %u depth %d partial %u "