Commit 97a28b9a authored by Hirofumi Ogawa's avatar Hirofumi Ogawa Committed by Linus Torvalds

[PATCH] FAT: removal of C[FT]_LE_[WL] macro

Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4e7c75e0
...@@ -237,13 +237,13 @@ int __fat_access(struct super_block *sb, int nr, int new_value) ...@@ -237,13 +237,13 @@ int __fat_access(struct super_block *sb, int nr, int new_value)
} }
if (sbi->fat_bits == 32) { if (sbi->fat_bits == 32) {
p_first = p_last = NULL; /* GCC needs that stuff */ p_first = p_last = NULL; /* GCC needs that stuff */
next = CF_LE_L(((__le32 *) bh->b_data)[(first & next = le32_to_cpu(((__le32 *) bh->b_data)[(first &
(sb->s_blocksize - 1)) >> 2]); (sb->s_blocksize - 1)) >> 2]);
/* Fscking Microsoft marketing department. Their "32" is 28. */ /* Fscking Microsoft marketing department. Their "32" is 28. */
next &= 0x0fffffff; next &= 0x0fffffff;
} else if (sbi->fat_bits == 16) { } else if (sbi->fat_bits == 16) {
p_first = p_last = NULL; /* GCC needs that stuff */ p_first = p_last = NULL; /* GCC needs that stuff */
next = CF_LE_W(((__le16 *) bh->b_data)[(first & next = le16_to_cpu(((__le16 *) bh->b_data)[(first &
(sb->s_blocksize - 1)) >> 1]); (sb->s_blocksize - 1)) >> 1]);
} else { } else {
p_first = &((__u8 *)bh->b_data)[first & (sb->s_blocksize - 1)]; p_first = &((__u8 *)bh->b_data)[first & (sb->s_blocksize - 1)];
...@@ -256,10 +256,10 @@ int __fat_access(struct super_block *sb, int nr, int new_value) ...@@ -256,10 +256,10 @@ int __fat_access(struct super_block *sb, int nr, int new_value)
if (new_value != -1) { if (new_value != -1) {
if (sbi->fat_bits == 32) { if (sbi->fat_bits == 32) {
((__le32 *)bh->b_data)[(first & (sb->s_blocksize - 1)) >> 2] ((__le32 *)bh->b_data)[(first & (sb->s_blocksize - 1)) >> 2]
= CT_LE_L(new_value); = cpu_to_le32(new_value);
} else if (sbi->fat_bits == 16) { } else if (sbi->fat_bits == 16) {
((__le16 *)bh->b_data)[(first & (sb->s_blocksize - 1)) >> 1] ((__le16 *)bh->b_data)[(first & (sb->s_blocksize - 1)) >> 1]
= CT_LE_W(new_value); = cpu_to_le16(new_value);
} else { } else {
if (nr & 1) { if (nr & 1) {
*p_first = (*p_first & 0xf) | (new_value << 4); *p_first = (*p_first & 0xf) | (new_value << 4);
......
...@@ -737,10 +737,10 @@ int fat_new_dir(struct inode *dir, struct inode *parent, int is_vfat) ...@@ -737,10 +737,10 @@ int fat_new_dir(struct inode *dir, struct inode *parent, int is_vfat)
de[0].adate = de[0].cdate = de[0].adate = de[0].cdate =
de[1].adate = de[1].cdate = date; de[1].adate = de[1].cdate = date;
} }
de[0].start = CT_LE_W(MSDOS_I(dir)->i_logstart); de[0].start = cpu_to_le16(MSDOS_I(dir)->i_logstart);
de[0].starthi = CT_LE_W(MSDOS_I(dir)->i_logstart>>16); de[0].starthi = cpu_to_le16(MSDOS_I(dir)->i_logstart>>16);
de[1].start = CT_LE_W(MSDOS_I(parent)->i_logstart); de[1].start = cpu_to_le16(MSDOS_I(parent)->i_logstart);
de[1].starthi = CT_LE_W(MSDOS_I(parent)->i_logstart>>16); de[1].starthi = cpu_to_le16(MSDOS_I(parent)->i_logstart>>16);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
dir->i_atime = dir->i_ctime = dir->i_mtime = CURRENT_TIME; dir->i_atime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
......
...@@ -864,7 +864,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, ...@@ -864,7 +864,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
brelse(bh); brelse(bh);
goto out_invalid; goto out_invalid;
} }
logical_sector_size = CF_LE_W(get_unaligned((__le16 *)&b->sector_size)); logical_sector_size =
le16_to_cpu(get_unaligned((__le16 *)&b->sector_size));
if (!logical_sector_size if (!logical_sector_size
|| (logical_sector_size & (logical_sector_size - 1)) || (logical_sector_size & (logical_sector_size - 1))
|| (logical_sector_size < 512) || (logical_sector_size < 512)
...@@ -913,8 +914,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, ...@@ -913,8 +914,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
sbi->cluster_bits = ffs(sbi->cluster_size) - 1; sbi->cluster_bits = ffs(sbi->cluster_size) - 1;
sbi->fats = b->fats; sbi->fats = b->fats;
sbi->fat_bits = 0; /* Don't know yet */ sbi->fat_bits = 0; /* Don't know yet */
sbi->fat_start = CF_LE_W(b->reserved); sbi->fat_start = le16_to_cpu(b->reserved);
sbi->fat_length = CF_LE_W(b->fat_length); sbi->fat_length = le16_to_cpu(b->fat_length);
sbi->root_cluster = 0; sbi->root_cluster = 0;
sbi->free_clusters = -1; /* Don't know yet */ sbi->free_clusters = -1; /* Don't know yet */
sbi->prev_free = -1; sbi->prev_free = -1;
...@@ -925,13 +926,13 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, ...@@ -925,13 +926,13 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
/* Must be FAT32 */ /* Must be FAT32 */
sbi->fat_bits = 32; sbi->fat_bits = 32;
sbi->fat_length = CF_LE_L(b->fat32_length); sbi->fat_length = le32_to_cpu(b->fat32_length);
sbi->root_cluster = CF_LE_L(b->root_cluster); sbi->root_cluster = le32_to_cpu(b->root_cluster);
sb->s_maxbytes = 0xffffffff; sb->s_maxbytes = 0xffffffff;
/* MC - if info_sector is 0, don't multiply by 0 */ /* MC - if info_sector is 0, don't multiply by 0 */
sbi->fsinfo_sector = CF_LE_W(b->info_sector); sbi->fsinfo_sector = le16_to_cpu(b->info_sector);
if (sbi->fsinfo_sector == 0) if (sbi->fsinfo_sector == 0)
sbi->fsinfo_sector = 1; sbi->fsinfo_sector = 1;
...@@ -949,12 +950,12 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, ...@@ -949,12 +950,12 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
"FAT: Did not find valid FSINFO signature.\n" "FAT: Did not find valid FSINFO signature.\n"
" Found signature1 0x%08x signature2 0x%08x" " Found signature1 0x%08x signature2 0x%08x"
" (sector = %lu)\n", " (sector = %lu)\n",
CF_LE_L(fsinfo->signature1), le32_to_cpu(fsinfo->signature1),
CF_LE_L(fsinfo->signature2), le32_to_cpu(fsinfo->signature2),
sbi->fsinfo_sector); sbi->fsinfo_sector);
} else { } else {
sbi->free_clusters = CF_LE_L(fsinfo->free_clusters); sbi->free_clusters = le32_to_cpu(fsinfo->free_clusters);
sbi->prev_free = CF_LE_L(fsinfo->next_cluster); sbi->prev_free = le32_to_cpu(fsinfo->next_cluster);
} }
brelse(fsinfo_bh); brelse(fsinfo_bh);
...@@ -964,7 +965,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, ...@@ -964,7 +965,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
sbi->dir_per_block_bits = ffs(sbi->dir_per_block) - 1; sbi->dir_per_block_bits = ffs(sbi->dir_per_block) - 1;
sbi->dir_start = sbi->fat_start + sbi->fats * sbi->fat_length; sbi->dir_start = sbi->fat_start + sbi->fats * sbi->fat_length;
sbi->dir_entries = CF_LE_W(get_unaligned((__le16 *)&b->dir_entries)); sbi->dir_entries =
le16_to_cpu(get_unaligned((__le16 *)&b->dir_entries));
if (sbi->dir_entries & (sbi->dir_per_block - 1)) { if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
if (!silent) if (!silent)
printk(KERN_ERR "FAT: bogus directroy-entries per block" printk(KERN_ERR "FAT: bogus directroy-entries per block"
...@@ -976,9 +978,9 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, ...@@ -976,9 +978,9 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
rootdir_sectors = sbi->dir_entries rootdir_sectors = sbi->dir_entries
* sizeof(struct msdos_dir_entry) / sb->s_blocksize; * sizeof(struct msdos_dir_entry) / sb->s_blocksize;
sbi->data_start = sbi->dir_start + rootdir_sectors; sbi->data_start = sbi->dir_start + rootdir_sectors;
total_sectors = CF_LE_W(get_unaligned((__le16 *)&b->sectors)); total_sectors = le16_to_cpu(get_unaligned((__le16 *)&b->sectors));
if (total_sectors == 0) if (total_sectors == 0)
total_sectors = CF_LE_L(b->total_sect); total_sectors = le32_to_cpu(b->total_sect);
total_clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus; total_clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus;
...@@ -1186,9 +1188,9 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) ...@@ -1186,9 +1188,9 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
inode->i_op = sbi->dir_ops; inode->i_op = sbi->dir_ops;
inode->i_fop = &fat_dir_operations; inode->i_fop = &fat_dir_operations;
MSDOS_I(inode)->i_start = CF_LE_W(de->start); MSDOS_I(inode)->i_start = le16_to_cpu(de->start);
if (sbi->fat_bits == 32) if (sbi->fat_bits == 32)
MSDOS_I(inode)->i_start |= (CF_LE_W(de->starthi) << 16); MSDOS_I(inode)->i_start |= (le16_to_cpu(de->starthi) << 16);
MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start; MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start;
error = fat_calc_dir_size(inode); error = fat_calc_dir_size(inode);
...@@ -1204,12 +1206,12 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) ...@@ -1204,12 +1206,12 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
!is_exec(de->ext)) !is_exec(de->ext))
? S_IRUGO|S_IWUGO : S_IRWXUGO) ? S_IRUGO|S_IWUGO : S_IRWXUGO)
& ~sbi->options.fs_fmask) | S_IFREG; & ~sbi->options.fs_fmask) | S_IFREG;
MSDOS_I(inode)->i_start = CF_LE_W(de->start); MSDOS_I(inode)->i_start = le16_to_cpu(de->start);
if (sbi->fat_bits == 32) if (sbi->fat_bits == 32)
MSDOS_I(inode)->i_start |= (CF_LE_W(de->starthi) << 16); MSDOS_I(inode)->i_start |= (le16_to_cpu(de->starthi) << 16);
MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start; MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start;
inode->i_size = CF_LE_L(de->size); inode->i_size = le32_to_cpu(de->size);
inode->i_op = &fat_file_inode_operations; inode->i_op = &fat_file_inode_operations;
inode->i_fop = &fat_file_operations; inode->i_fop = &fat_file_operations;
inode->i_mapping->a_ops = &fat_aops; inode->i_mapping->a_ops = &fat_aops;
...@@ -1224,11 +1226,11 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) ...@@ -1224,11 +1226,11 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
inode->i_blocks = ((inode->i_size + (sbi->cluster_size - 1)) inode->i_blocks = ((inode->i_size + (sbi->cluster_size - 1))
& ~((loff_t)sbi->cluster_size - 1)) >> 9; & ~((loff_t)sbi->cluster_size - 1)) >> 9;
inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_mtime.tv_sec = inode->i_atime.tv_sec =
date_dos2unix(CF_LE_W(de->time),CF_LE_W(de->date)); date_dos2unix(le16_to_cpu(de->time), le16_to_cpu(de->date));
inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0; inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;
inode->i_ctime.tv_sec = inode->i_ctime.tv_sec =
MSDOS_SB(sb)->options.isvfat MSDOS_SB(sb)->options.isvfat
? date_dos2unix(CF_LE_W(de->ctime),CF_LE_W(de->cdate)) ? date_dos2unix(le16_to_cpu(de->ctime), le16_to_cpu(de->cdate))
: inode->i_mtime.tv_sec; : inode->i_mtime.tv_sec;
inode->i_ctime.tv_nsec = de->ctime_ms * 1000000; inode->i_ctime.tv_nsec = de->ctime_ms * 1000000;
MSDOS_I(inode)->i_ctime_ms = de->ctime_ms; MSDOS_I(inode)->i_ctime_ms = de->ctime_ms;
...@@ -1272,12 +1274,12 @@ static int fat_write_inode(struct inode *inode, int wait) ...@@ -1272,12 +1274,12 @@ static int fat_write_inode(struct inode *inode, int wait)
} }
else { else {
raw_entry->attr = ATTR_NONE; raw_entry->attr = ATTR_NONE;
raw_entry->size = CT_LE_L(inode->i_size); raw_entry->size = cpu_to_le32(inode->i_size);
} }
raw_entry->attr |= MSDOS_MKATTR(inode->i_mode) | raw_entry->attr |= MSDOS_MKATTR(inode->i_mode) |
MSDOS_I(inode)->i_attrs; MSDOS_I(inode)->i_attrs;
raw_entry->start = CT_LE_W(MSDOS_I(inode)->i_logstart); raw_entry->start = cpu_to_le16(MSDOS_I(inode)->i_logstart);
raw_entry->starthi = CT_LE_W(MSDOS_I(inode)->i_logstart >> 16); raw_entry->starthi = cpu_to_le16(MSDOS_I(inode)->i_logstart >> 16);
fat_date_unix2dos(inode->i_mtime.tv_sec, &raw_entry->time, &raw_entry->date); fat_date_unix2dos(inode->i_mtime.tv_sec, &raw_entry->time, &raw_entry->date);
if (sbi->options.isvfat) { if (sbi->options.isvfat) {
fat_date_unix2dos(inode->i_ctime.tv_sec,&raw_entry->ctime,&raw_entry->cdate); fat_date_unix2dos(inode->i_ctime.tv_sec,&raw_entry->ctime,&raw_entry->cdate);
......
...@@ -69,7 +69,8 @@ void fat_clusters_flush(struct super_block *sb) ...@@ -69,7 +69,8 @@ void fat_clusters_flush(struct super_block *sb)
printk(KERN_ERR "FAT: Did not find valid FSINFO signature.\n" printk(KERN_ERR "FAT: Did not find valid FSINFO signature.\n"
" Found signature1 0x%08x signature2 0x%08x" " Found signature1 0x%08x signature2 0x%08x"
" (sector = %lu)\n", " (sector = %lu)\n",
CF_LE_L(fsinfo->signature1), CF_LE_L(fsinfo->signature2), le32_to_cpu(fsinfo->signature1),
le32_to_cpu(fsinfo->signature2),
sbi->fsinfo_sector); sbi->fsinfo_sector);
} else { } else {
if (sbi->free_clusters != -1) if (sbi->free_clusters != -1)
......
...@@ -501,8 +501,8 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, ...@@ -501,8 +501,8 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
mark_inode_dirty(new_inode); mark_inode_dirty(new_inode);
} }
if (dotdot_bh) { if (dotdot_bh) {
dotdot_de->start = CT_LE_W(MSDOS_I(new_dir)->i_logstart); dotdot_de->start = cpu_to_le16(MSDOS_I(new_dir)->i_logstart);
dotdot_de->starthi = CT_LE_W((MSDOS_I(new_dir)->i_logstart) >> 16); dotdot_de->starthi = cpu_to_le16((MSDOS_I(new_dir)->i_logstart) >> 16);
mark_buffer_dirty(dotdot_bh); mark_buffer_dirty(dotdot_bh);
old_dir->i_nlink--; old_dir->i_nlink--;
mark_inode_dirty(old_dir); mark_inode_dirty(old_dir);
......
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
#define FAT_FSINFO_SIG1 0x41615252 #define FAT_FSINFO_SIG1 0x41615252
#define FAT_FSINFO_SIG2 0x61417272 #define FAT_FSINFO_SIG2 0x61417272
#define IS_FSINFO(x) (CF_LE_L((x)->signature1) == FAT_FSINFO_SIG1 \ #define IS_FSINFO(x) (le32_to_cpu((x)->signature1) == FAT_FSINFO_SIG1 \
&& CF_LE_L((x)->signature2) == FAT_FSINFO_SIG2) && le32_to_cpu((x)->signature2) == FAT_FSINFO_SIG2)
/* /*
* ioctl commands * ioctl commands
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment