Messages in this thread Patch in this message |  | | | Subject | [PATCH 21/21] fat: i_blocks warning fix | | From | OGAWA Hirofumi <> | | Date | Wed, 15 Oct 2008 22:58:01 +0900 |
| |
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> --- fs/fat/dir.c | 2 +- fs/fat/fat.h | 3 +++ fs/fat/fatent.c | 5 ++--- fs/fat/misc.c | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff -puN fs/fat/misc.c~fat-i_blocks-warn-fix fs/fat/misc.c --- linux-2.6/fs/fat/misc.c~fat-i_blocks-warn-fix 2008-10-13 02:02:50.000000000 +0900 +++ linux-2.6-hirofumi/fs/fat/misc.c 2008-10-13 02:13:16.000000000 +0900 @@ -124,8 +124,9 @@ int fat_chain_add(struct inode *inode, i mark_inode_dirty(inode); } if (new_fclus != (inode->i_blocks >> (sbi->cluster_bits - 9))) { - fat_fs_panic(sb, "clusters badly computed (%d != %lu)", - new_fclus, inode->i_blocks >> (sbi->cluster_bits - 9)); + fat_fs_panic(sb, "clusters badly computed (%d != %llu)", + new_fclus, + (llu)(inode->i_blocks >> (sbi->cluster_bits - 9))); fat_cache_inval_inode(inode); } inode->i_blocks += nr_cluster << (sbi->cluster_bits - 9); diff -puN fs/fat/fat.h~fat-i_blocks-warn-fix fs/fat/fat.h --- linux-2.6/fs/fat/fat.h~fat-i_blocks-warn-fix 2008-10-13 02:14:12.000000000 +0900 +++ linux-2.6-hirofumi/fs/fat/fat.h 2008-10-13 02:17:52.000000000 +0900 @@ -323,4 +323,7 @@ extern int fat_sync_bhs(struct buffer_he int fat_cache_init(void); void fat_cache_destroy(void); +/* helper for printk */ +typedef unsigned long long llu; + #endif /* !_FAT_H */ diff -puN fs/fat/dir.c~fat-i_blocks-warn-fix fs/fat/dir.c --- linux-2.6/fs/fat/dir.c~fat-i_blocks-warn-fix 2008-10-13 02:15:43.000000000 +0900 +++ linux-2.6-hirofumi/fs/fat/dir.c 2008-10-13 02:15:50.000000000 +0900 @@ -86,7 +86,7 @@ next: *bh = sb_bread(sb, phys); if (*bh == NULL) { printk(KERN_ERR "FAT: Directory bread(block %llu) failed\n", - (unsigned long long)phys); + (llu)phys); /* skip this block */ *pos = (iblock + 1) << sb->s_blocksize_bits; goto next; diff -puN fs/fat/fatent.c~fat-i_blocks-warn-fix fs/fat/fatent.c --- linux-2.6/fs/fat/fatent.c~fat-i_blocks-warn-fix 2008-10-13 02:16:13.000000000 +0900 +++ linux-2.6-hirofumi/fs/fat/fatent.c 2008-10-13 02:16:26.000000000 +0900 @@ -93,8 +93,7 @@ static int fat12_ent_bread(struct super_ err_brelse: brelse(bhs[0]); err: - printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", - (unsigned long long)blocknr); + printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", (llu)blocknr); return -EIO; } @@ -107,7 +106,7 @@ static int fat_ent_bread(struct super_bl fatent->bhs[0] = sb_bread(sb, blocknr); if (!fatent->bhs[0]) { printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", - (unsigned long long)blocknr); + (llu)blocknr); return -EIO; } fatent->nr_bhs = 1; _
|  |