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>

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>
Theodore Ts'o
1 parent 171a7f21a7
Showing 4 changed files with 17 additions and 15 deletions Side-by-side Diff
fs/ext4/namei.c
fs/ext4/super.c
fs/ext4/xattr.c
include/trace/events/ext4.h
@@ -416,15 +416,16 @@
 {
 	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);
 }
@@ -1952,16 +1952,16 @@
 	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;
@@ -122,17 +122,18 @@
 				    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);
 }
  
@@ -1948,7 +1948,7 @@
 		__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_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 @@
 		__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 "
...	...	@@ -416,15 +416,16 @@
416	416	{
417	417	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
418	418	struct ext4_inode_info *ei = EXT4_I(inode);
419		- __u32 csum, old_csum;
	419	+ __u32 csum;
	420	+ __le32 save_csum;
420	421	int size;
421	422
422	423	size = count_offset + (count * sizeof(struct dx_entry));
423		- old_csum = t->dt_checksum;
	424	+ save_csum = t->dt_checksum;
424	425	t->dt_checksum = 0;
425	426	csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)dirent, size);
426	427	csum = ext4_chksum(sbi, csum, (__u8 *)t, sizeof(struct dx_tail));
427		- t->dt_checksum = old_csum;
	428	+ t->dt_checksum = save_csum;
428	429
429	430	return cpu_to_le32(csum);
430	431	}
...	...	@@ -1952,16 +1952,16 @@
1952	1952	if ((sbi->s_es->s_feature_ro_compat &
1953	1953	cpu_to_le32(EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))) {
1954	1954	/* Use new metadata_csum algorithm */
1955		- __u16 old_csum;
	1955	+ __le16 save_csum;
1956	1956	__u32 csum32;
1957	1957
1958		- old_csum = gdp->bg_checksum;
	1958	+ save_csum = gdp->bg_checksum;
1959	1959	gdp->bg_checksum = 0;
1960	1960	csum32 = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&le_group,
1961	1961	sizeof(le_group));
1962	1962	csum32 = ext4_chksum(sbi, csum32, (__u8 *)gdp,
1963	1963	sbi->s_desc_size);
1964		- gdp->bg_checksum = old_csum;
	1964	+ gdp->bg_checksum = save_csum;
1965	1965
1966	1966	crc = csum32 & 0xFFFF;
1967	1967	goto out;
...	...	@@ -122,17 +122,18 @@
122	122	struct ext4_xattr_header *hdr)
123	123	{
124	124	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
125		- __u32 csum, old;
	125	+ __u32 csum;
	126	+ __le32 save_csum;
	127	+ __le64 dsk_block_nr = cpu_to_le64(block_nr);
126	128
127		- old = hdr->h_checksum;
	129	+ save_csum = hdr->h_checksum;
128	130	hdr->h_checksum = 0;
129		- block_nr = cpu_to_le64(block_nr);
130		- csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&block_nr,
131		- sizeof(block_nr));
	131	+ csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&dsk_block_nr,
	132	+ sizeof(dsk_block_nr));
132	133	csum = ext4_chksum(sbi, csum, (__u8 *)hdr,
133	134	EXT4_BLOCK_SIZE(inode->i_sb));
134	135
135		- hdr->h_checksum = old;
	136	+ hdr->h_checksum = save_csum;
136	137	return cpu_to_le32(csum);
137	138	}
138	139
...	...	@@ -1948,7 +1948,7 @@
1948	1948	__entry->to = to;
1949	1949	__entry->partial = partial_cluster;
1950	1950	__entry->ee_pblk = ext4_ext_pblock(ex);
1951		- __entry->ee_lblk = cpu_to_le32(ex->ee_block);
	1951	+ __entry->ee_lblk = le32_to_cpu(ex->ee_block);
1952	1952	__entry->ee_len = ext4_ext_get_actual_len(ex);
1953	1953	),
1954	1954
...	...	@@ -2052,7 +2052,7 @@
2052	2052
2053	2053	TRACE_EVENT(ext4_ext_remove_space_done,
2054	2054	TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth,
2055		- ext4_lblk_t partial, unsigned short eh_entries),
	2055	+ ext4_lblk_t partial, __le16 eh_entries),
2056	2056
2057	2057	TP_ARGS(inode, start, depth, partial, eh_entries),
2058	2058
...	...	@@ -2071,7 +2071,7 @@
2071	2071	__entry->start = start;
2072	2072	__entry->depth = depth;
2073	2073	__entry->partial = partial;
2074		- __entry->eh_entries = eh_entries;
	2074	+ __entry->eh_entries = le16_to_cpu(eh_entries);
2075	2075	),
2076	2076
2077	2077	TP_printk("dev %d,%d ino %lu since %u depth %d partial %u "