<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">
From: OGAWA Hirofumi &lt;hirofumi@mail.parknet.co.jp&gt;

Signed-off-by: OGAWA Hirofumi &lt;hirofumi@mail.parknet.co.jp&gt;
---

Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
---

 25-akpm/fs/fat/cache.c           |    8 +++---
 25-akpm/fs/fat/dir.c             |    8 +++---
 25-akpm/fs/fat/inode.c           |   48 ++++++++++++++++++++-------------------
 25-akpm/fs/fat/misc.c            |    3 +-
 25-akpm/fs/msdos/namei.c         |    4 +--
 25-akpm/include/linux/msdos_fs.h |    4 +--
 6 files changed, 39 insertions(+), 36 deletions(-)

diff -puN fs/fat/cache.c~fat-removal-of-c_le_-macro fs/fat/cache.c
--- 25/fs/fat/cache.c~fat-removal-of-c_le_-macro	2004-09-25 22:06:07.136410744 -0700
+++ 25-akpm/fs/fat/cache.c	2004-09-25 22:06:07.147409072 -0700
@@ -237,13 +237,13 @@ int __fat_access(struct super_block *sb,
 	}
 	if (sbi-&gt;fat_bits == 32) {
 		p_first = p_last = NULL; /* GCC needs that stuff */
-		next = CF_LE_L(((__le32 *) bh-&gt;b_data)[(first &amp;
+		next = le32_to_cpu(((__le32 *) bh-&gt;b_data)[(first &amp;
 		    (sb-&gt;s_blocksize - 1)) &gt;&gt; 2]);
 		/* Fscking Microsoft marketing department. Their "32" is 28. */
 		next &amp;= 0x0fffffff;
 	} else if (sbi-&gt;fat_bits == 16) {
 		p_first = p_last = NULL; /* GCC needs that stuff */
-		next = CF_LE_W(((__le16 *) bh-&gt;b_data)[(first &amp;
+		next = le16_to_cpu(((__le16 *) bh-&gt;b_data)[(first &amp;
 		    (sb-&gt;s_blocksize - 1)) &gt;&gt; 1]);
 	} else {
 		p_first = &amp;((__u8 *)bh-&gt;b_data)[first &amp; (sb-&gt;s_blocksize - 1)];
@@ -256,10 +256,10 @@ int __fat_access(struct super_block *sb,
 	if (new_value != -1) {
 		if (sbi-&gt;fat_bits == 32) {
 			((__le32 *)bh-&gt;b_data)[(first &amp; (sb-&gt;s_blocksize - 1)) &gt;&gt; 2]
-				= CT_LE_L(new_value);
+				= cpu_to_le32(new_value);
 		} else if (sbi-&gt;fat_bits == 16) {
 			((__le16 *)bh-&gt;b_data)[(first &amp; (sb-&gt;s_blocksize - 1)) &gt;&gt; 1]
-				= CT_LE_W(new_value);
+				= cpu_to_le16(new_value);
 		} else {
 			if (nr &amp; 1) {
 				*p_first = (*p_first &amp; 0xf) | (new_value &lt;&lt; 4);
diff -puN fs/fat/dir.c~fat-removal-of-c_le_-macro fs/fat/dir.c
--- 25/fs/fat/dir.c~fat-removal-of-c_le_-macro	2004-09-25 22:06:07.137410592 -0700
+++ 25-akpm/fs/fat/dir.c	2004-09-25 22:06:07.148408920 -0700
@@ -737,10 +737,10 @@ int fat_new_dir(struct inode *dir, struc
 		de[0].adate = de[0].cdate =
 			de[1].adate = de[1].cdate = date;
 	}
-	de[0].start = CT_LE_W(MSDOS_I(dir)-&gt;i_logstart);
-	de[0].starthi = CT_LE_W(MSDOS_I(dir)-&gt;i_logstart&gt;&gt;16);
-	de[1].start = CT_LE_W(MSDOS_I(parent)-&gt;i_logstart);
-	de[1].starthi = CT_LE_W(MSDOS_I(parent)-&gt;i_logstart&gt;&gt;16);
+	de[0].start = cpu_to_le16(MSDOS_I(dir)-&gt;i_logstart);
+	de[0].starthi = cpu_to_le16(MSDOS_I(dir)-&gt;i_logstart&gt;&gt;16);
+	de[1].start = cpu_to_le16(MSDOS_I(parent)-&gt;i_logstart);
+	de[1].starthi = cpu_to_le16(MSDOS_I(parent)-&gt;i_logstart&gt;&gt;16);
 	mark_buffer_dirty(bh);
 	brelse(bh);
 	dir-&gt;i_atime = dir-&gt;i_ctime = dir-&gt;i_mtime = CURRENT_TIME;
diff -puN fs/fat/inode.c~fat-removal-of-c_le_-macro fs/fat/inode.c
--- 25/fs/fat/inode.c~fat-removal-of-c_le_-macro	2004-09-25 22:06:07.139410288 -0700
+++ 25-akpm/fs/fat/inode.c	2004-09-25 22:06:07.150408616 -0700
@@ -864,7 +864,8 @@ int fat_fill_super(struct super_block *s
 		brelse(bh);
 		goto out_invalid;
 	}
-	logical_sector_size = CF_LE_W(get_unaligned((__le16 *)&amp;b-&gt;sector_size));
+	logical_sector_size =
+		le16_to_cpu(get_unaligned((__le16 *)&amp;b-&gt;sector_size));
 	if (!logical_sector_size
 	    || (logical_sector_size &amp; (logical_sector_size - 1))
 	    || (logical_sector_size &lt; 512)
@@ -913,8 +914,8 @@ int fat_fill_super(struct super_block *s
 	sbi-&gt;cluster_bits = ffs(sbi-&gt;cluster_size) - 1;
 	sbi-&gt;fats = b-&gt;fats;
 	sbi-&gt;fat_bits = 0;		/* Don't know yet */
-	sbi-&gt;fat_start = CF_LE_W(b-&gt;reserved);
-	sbi-&gt;fat_length = CF_LE_W(b-&gt;fat_length);
+	sbi-&gt;fat_start = le16_to_cpu(b-&gt;reserved);
+	sbi-&gt;fat_length = le16_to_cpu(b-&gt;fat_length);
 	sbi-&gt;root_cluster = 0;
 	sbi-&gt;free_clusters = -1;	/* Don't know yet */
 	sbi-&gt;prev_free = -1;
@@ -925,13 +926,13 @@ int fat_fill_super(struct super_block *s
 
 		/* Must be FAT32 */
 		sbi-&gt;fat_bits = 32;
-		sbi-&gt;fat_length = CF_LE_L(b-&gt;fat32_length);
-		sbi-&gt;root_cluster = CF_LE_L(b-&gt;root_cluster);
+		sbi-&gt;fat_length = le32_to_cpu(b-&gt;fat32_length);
+		sbi-&gt;root_cluster = le32_to_cpu(b-&gt;root_cluster);
 
 		sb-&gt;s_maxbytes = 0xffffffff;
 		
 		/* MC - if info_sector is 0, don't multiply by 0 */
-		sbi-&gt;fsinfo_sector = CF_LE_W(b-&gt;info_sector);
+		sbi-&gt;fsinfo_sector = le16_to_cpu(b-&gt;info_sector);
 		if (sbi-&gt;fsinfo_sector == 0)
 			sbi-&gt;fsinfo_sector = 1;
 
@@ -949,12 +950,12 @@ int fat_fill_super(struct super_block *s
 			       "FAT: Did not find valid FSINFO signature.\n"
 			       "     Found signature1 0x%08x signature2 0x%08x"
 			       " (sector = %lu)\n",
-			       CF_LE_L(fsinfo-&gt;signature1),
-			       CF_LE_L(fsinfo-&gt;signature2),
+			       le32_to_cpu(fsinfo-&gt;signature1),
+			       le32_to_cpu(fsinfo-&gt;signature2),
 			       sbi-&gt;fsinfo_sector);
 		} else {
-			sbi-&gt;free_clusters = CF_LE_L(fsinfo-&gt;free_clusters);
-			sbi-&gt;prev_free = CF_LE_L(fsinfo-&gt;next_cluster);
+			sbi-&gt;free_clusters = le32_to_cpu(fsinfo-&gt;free_clusters);
+			sbi-&gt;prev_free = le32_to_cpu(fsinfo-&gt;next_cluster);
 		}
 
 		brelse(fsinfo_bh);
@@ -964,7 +965,8 @@ int fat_fill_super(struct super_block *s
 	sbi-&gt;dir_per_block_bits = ffs(sbi-&gt;dir_per_block) - 1;
 
 	sbi-&gt;dir_start = sbi-&gt;fat_start + sbi-&gt;fats * sbi-&gt;fat_length;
-	sbi-&gt;dir_entries = CF_LE_W(get_unaligned((__le16 *)&amp;b-&gt;dir_entries));
+	sbi-&gt;dir_entries =
+		le16_to_cpu(get_unaligned((__le16 *)&amp;b-&gt;dir_entries));
 	if (sbi-&gt;dir_entries &amp; (sbi-&gt;dir_per_block - 1)) {
 		if (!silent)
 			printk(KERN_ERR "FAT: bogus directroy-entries per block"
@@ -976,9 +978,9 @@ int fat_fill_super(struct super_block *s
 	rootdir_sectors = sbi-&gt;dir_entries
 		* sizeof(struct msdos_dir_entry) / sb-&gt;s_blocksize;
 	sbi-&gt;data_start = sbi-&gt;dir_start + rootdir_sectors;
-	total_sectors = CF_LE_W(get_unaligned((__le16 *)&amp;b-&gt;sectors));
+	total_sectors = le16_to_cpu(get_unaligned((__le16 *)&amp;b-&gt;sectors));
 	if (total_sectors == 0)
-		total_sectors = CF_LE_L(b-&gt;total_sect);
+		total_sectors = le32_to_cpu(b-&gt;total_sect);
 
 	total_clusters = (total_sectors - sbi-&gt;data_start) / sbi-&gt;sec_per_clus;
 
@@ -1186,9 +1188,9 @@ static int fat_fill_inode(struct inode *
 		inode-&gt;i_op = sbi-&gt;dir_ops;
 		inode-&gt;i_fop = &amp;fat_dir_operations;
 
-		MSDOS_I(inode)-&gt;i_start = CF_LE_W(de-&gt;start);
+		MSDOS_I(inode)-&gt;i_start = le16_to_cpu(de-&gt;start);
 		if (sbi-&gt;fat_bits == 32)
-			MSDOS_I(inode)-&gt;i_start |= (CF_LE_W(de-&gt;starthi) &lt;&lt; 16);
+			MSDOS_I(inode)-&gt;i_start |= (le16_to_cpu(de-&gt;starthi) &lt;&lt; 16);
 
 		MSDOS_I(inode)-&gt;i_logstart = MSDOS_I(inode)-&gt;i_start;
 		error = fat_calc_dir_size(inode);
@@ -1204,12 +1206,12 @@ static int fat_fill_inode(struct inode *
 		       !is_exec(de-&gt;ext))
 		    	? S_IRUGO|S_IWUGO : S_IRWXUGO)
 		    &amp; ~sbi-&gt;options.fs_fmask) | S_IFREG;
-		MSDOS_I(inode)-&gt;i_start = CF_LE_W(de-&gt;start);
+		MSDOS_I(inode)-&gt;i_start = le16_to_cpu(de-&gt;start);
 		if (sbi-&gt;fat_bits == 32)
-			MSDOS_I(inode)-&gt;i_start |= (CF_LE_W(de-&gt;starthi) &lt;&lt; 16);
+			MSDOS_I(inode)-&gt;i_start |= (le16_to_cpu(de-&gt;starthi) &lt;&lt; 16);
 
 		MSDOS_I(inode)-&gt;i_logstart = MSDOS_I(inode)-&gt;i_start;
-		inode-&gt;i_size = CF_LE_L(de-&gt;size);
+		inode-&gt;i_size = le32_to_cpu(de-&gt;size);
 	        inode-&gt;i_op = &amp;fat_file_inode_operations;
 	        inode-&gt;i_fop = &amp;fat_file_operations;
 		inode-&gt;i_mapping-&gt;a_ops = &amp;fat_aops;
@@ -1224,11 +1226,11 @@ static int fat_fill_inode(struct inode *
 	inode-&gt;i_blocks = ((inode-&gt;i_size + (sbi-&gt;cluster_size - 1))
 			   &amp; ~((loff_t)sbi-&gt;cluster_size - 1)) &gt;&gt; 9;
 	inode-&gt;i_mtime.tv_sec = inode-&gt;i_atime.tv_sec =
-		date_dos2unix(CF_LE_W(de-&gt;time),CF_LE_W(de-&gt;date));
+		date_dos2unix(le16_to_cpu(de-&gt;time), le16_to_cpu(de-&gt;date));
 	inode-&gt;i_mtime.tv_nsec = inode-&gt;i_atime.tv_nsec = 0;
 	inode-&gt;i_ctime.tv_sec =
 		MSDOS_SB(sb)-&gt;options.isvfat
-		? date_dos2unix(CF_LE_W(de-&gt;ctime),CF_LE_W(de-&gt;cdate))
+		? date_dos2unix(le16_to_cpu(de-&gt;ctime), le16_to_cpu(de-&gt;cdate))
 		: inode-&gt;i_mtime.tv_sec;
 	inode-&gt;i_ctime.tv_nsec = de-&gt;ctime_ms * 1000000;
 	MSDOS_I(inode)-&gt;i_ctime_ms = de-&gt;ctime_ms;
@@ -1272,12 +1274,12 @@ retry:
 	}
 	else {
 		raw_entry-&gt;attr = ATTR_NONE;
-		raw_entry-&gt;size = CT_LE_L(inode-&gt;i_size);
+		raw_entry-&gt;size = cpu_to_le32(inode-&gt;i_size);
 	}
 	raw_entry-&gt;attr |= MSDOS_MKATTR(inode-&gt;i_mode) |
 	    MSDOS_I(inode)-&gt;i_attrs;
-	raw_entry-&gt;start = CT_LE_W(MSDOS_I(inode)-&gt;i_logstart);
-	raw_entry-&gt;starthi = CT_LE_W(MSDOS_I(inode)-&gt;i_logstart &gt;&gt; 16);
+	raw_entry-&gt;start = cpu_to_le16(MSDOS_I(inode)-&gt;i_logstart);
+	raw_entry-&gt;starthi = cpu_to_le16(MSDOS_I(inode)-&gt;i_logstart &gt;&gt; 16);
 	fat_date_unix2dos(inode-&gt;i_mtime.tv_sec, &amp;raw_entry-&gt;time, &amp;raw_entry-&gt;date);
 	if (sbi-&gt;options.isvfat) {
 		fat_date_unix2dos(inode-&gt;i_ctime.tv_sec,&amp;raw_entry-&gt;ctime,&amp;raw_entry-&gt;cdate);
diff -puN fs/fat/misc.c~fat-removal-of-c_le_-macro fs/fat/misc.c
--- 25/fs/fat/misc.c~fat-removal-of-c_le_-macro	2004-09-25 22:06:07.140410136 -0700
+++ 25-akpm/fs/fat/misc.c	2004-09-25 22:06:07.151408464 -0700
@@ -69,7 +69,8 @@ void fat_clusters_flush(struct super_blo
 		printk(KERN_ERR "FAT: Did not find valid FSINFO signature.\n"
 		       "     Found signature1 0x%08x signature2 0x%08x"
 		       " (sector = %lu)\n",
-		       CF_LE_L(fsinfo-&gt;signature1), CF_LE_L(fsinfo-&gt;signature2),
+		       le32_to_cpu(fsinfo-&gt;signature1),
+		       le32_to_cpu(fsinfo-&gt;signature2),
 		       sbi-&gt;fsinfo_sector);
 	} else {
 		if (sbi-&gt;free_clusters != -1)
diff -puN fs/msdos/namei.c~fat-removal-of-c_le_-macro fs/msdos/namei.c
--- 25/fs/msdos/namei.c~fat-removal-of-c_le_-macro	2004-09-25 22:06:07.142409832 -0700
+++ 25-akpm/fs/msdos/namei.c	2004-09-25 22:06:07.151408464 -0700
@@ -501,8 +501,8 @@ static int do_msdos_rename(struct inode 
 		mark_inode_dirty(new_inode);
 	}
 	if (dotdot_bh) {
-		dotdot_de-&gt;start = CT_LE_W(MSDOS_I(new_dir)-&gt;i_logstart);
-		dotdot_de-&gt;starthi = CT_LE_W((MSDOS_I(new_dir)-&gt;i_logstart) &gt;&gt; 16);
+		dotdot_de-&gt;start = cpu_to_le16(MSDOS_I(new_dir)-&gt;i_logstart);
+		dotdot_de-&gt;starthi = cpu_to_le16((MSDOS_I(new_dir)-&gt;i_logstart) &gt;&gt; 16);
 		mark_buffer_dirty(dotdot_bh);
 		old_dir-&gt;i_nlink--;
 		mark_inode_dirty(old_dir);
diff -puN include/linux/msdos_fs.h~fat-removal-of-c_le_-macro include/linux/msdos_fs.h
--- 25/include/linux/msdos_fs.h~fat-removal-of-c_le_-macro	2004-09-25 22:06:07.144409528 -0700
+++ 25-akpm/include/linux/msdos_fs.h	2004-09-25 22:06:07.152408312 -0700
@@ -87,8 +87,8 @@
 
 #define FAT_FSINFO_SIG1	0x41615252
 #define FAT_FSINFO_SIG2	0x61417272
-#define IS_FSINFO(x)	(CF_LE_L((x)-&gt;signature1) == FAT_FSINFO_SIG1	\
-			 &amp;&amp; CF_LE_L((x)-&gt;signature2) == FAT_FSINFO_SIG2)
+#define IS_FSINFO(x)	(le32_to_cpu((x)-&gt;signature1) == FAT_FSINFO_SIG1 \
+			 &amp;&amp; le32_to_cpu((x)-&gt;signature2) == FAT_FSINFO_SIG2)
 
 /*
  * ioctl commands
_
</pre></body></html>