mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

fat: i_blocks warning fix

Browse source 
blkcnt_t type depends on CONFIG_LSF. Use unsigned long long always for
printk().  But lazy to type it, so add "llu" and use it.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
OGAWA Hirofumi 2008-11-06 12:53:58 -08:00 committed by Linus Torvalds
parent 9ca59f4c3d
commit c3302931db
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/fat/dir.c
View file

@ -86,7 +86,7 @@ static int fat__get_entry(struct inode *dir, loff_t *pos,
*bh = sb_bread(sb, phys); *bh = sb_bread(sb, phys);
if (*bh == NULL) { if (*bh == NULL) {
printk(KERN_ERR "FAT: Directory bread(block %llu) failed\n", printk(KERN_ERR "FAT: Directory bread(block %llu) failed\n",
(unsigned long long)phys); (llu)phys);
/* skip this block */ /* skip this block */
*pos = (iblock + 1) << sb->s_blocksize_bits; *pos = (iblock + 1) << sb->s_blocksize_bits;
goto next; goto next;

3
fs/fat/fat.h
View file

@ -323,4 +323,7 @@ extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs);
int fat_cache_init(void); int fat_cache_init(void);
void fat_cache_destroy(void); void fat_cache_destroy(void);
/* helper for printk */
typedef unsigned long long llu;
#endif /* !_FAT_H */ #endif /* !_FAT_H */

5
fs/fat/fatent.c
View file

@ -93,8 +93,7 @@ static int fat12_ent_bread(struct super_block *sb, struct fat_entry *fatent,
err_brelse: err_brelse:
brelse(bhs[0]); brelse(bhs[0]);
err: err:
printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", (llu)blocknr);
(unsigned long long)blocknr);
return -EIO; return -EIO;
} }
@ -107,7 +106,7 @@ static int fat_ent_bread(struct super_block *sb, struct fat_entry *fatent,
fatent->bhs[0] = sb_bread(sb, blocknr); fatent->bhs[0] = sb_bread(sb, blocknr);
if (!fatent->bhs[0]) { if (!fatent->bhs[0]) {
printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n",
(unsigned long long)blocknr); (llu)blocknr);
return -EIO; return -EIO;
} }
fatent->nr_bhs = 1; fatent->nr_bhs = 1;

5
fs/fat/misc.c
View file

@ -124,8 +124,9 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster)
mark_inode_dirty(inode); mark_inode_dirty(inode);
} }
if (new_fclus != (inode->i_blocks >> (sbi->cluster_bits - 9))) { if (new_fclus != (inode->i_blocks >> (sbi->cluster_bits - 9))) {
fat_fs_panic(sb, "clusters badly computed (%d != %lu)", fat_fs_panic(sb, "clusters badly computed (%d != %llu)",
new_fclus, inode->i_blocks >> (sbi->cluster_bits - 9)); new_fclus,
(llu)(inode->i_blocks >> (sbi->cluster_bits - 9)));
fat_cache_inval_inode(inode); fat_cache_inval_inode(inode);
} }
inode->i_blocks += nr_cluster << (sbi->cluster_bits - 9); inode->i_blocks += nr_cluster << (sbi->cluster_bits - 9);