From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, hirofumi@mail.parknet.co.jp
Subject: [PATCH 21/21] fat: i_blocks warning fix
Date: Wed, 15 Oct 2008 22:58:01 +0900 [thread overview]
Message-ID: <26b742873e848f5f6e92122369.ps@mail.parknet.co.jp> (raw)
In-Reply-To: <ed5d0b893e848f5f6e92022369.ps@mail.parknet.co.jp>
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;
_
next prev parent reply other threads:[~2008-10-15 14:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-15 13:57 [PATCH 01/21] fat: document additional vfat mount options OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 02/21] fat: move fs/vfat/* and fs/msdos/* to fs/fat OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 03/21] fat: split include/msdos_fs.h OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 04/21] fat: Fix and cleanup timestamp conversion OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 05/21] fat: use generic_file_llseek() for directory OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 06/21] fat: cleanup fat_parse_long() error handling OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 07/21] fat: improve fat_hash() OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 08/21] fat: Fix fat_ent_update_ptr() for FAT12 OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 09/21] fat: use fat_detach() in fat_clear_inode() OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 10/21] vfat: Fix vfat_find() error path in vfat_lookup() OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 11/21] fat: Fix/Cleanup dcache handling for vfat OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 12/21] fat: Kill d_invalidate() in vfat_lookup() OGAWA Hirofumi
2008-10-15 13:57 ` [PATCH 13/21] fat: Cleanup msdos_lookup() OGAWA Hirofumi
2008-10-15 13:58 ` [PATCH 14/21] fat: Cleanup FAT attribute stuff OGAWA Hirofumi
2008-10-15 13:58 ` [PATCH 15/21] fat: Fix ATTR_RO in the case of (~umask & S_WUGO) == 0 OGAWA Hirofumi
2008-10-15 13:58 ` [PATCH 16/21] fat: Fix ATTR_RO for directory OGAWA Hirofumi
2008-10-15 13:58 ` [PATCH 17/21] fat: Fix _fat_bmap() race OGAWA Hirofumi
2008-10-15 13:58 ` [PATCH 18/21] fat: Add printf attribute to fat_fs_panic() OGAWA Hirofumi
2008-10-15 13:58 ` [PATCH 19/21] fat: mmu_private race fix OGAWA Hirofumi
2008-10-15 13:58 ` [PATCH 20/21] fat: ->i_pos " OGAWA Hirofumi
2008-10-15 13:58 ` OGAWA Hirofumi [this message]
2009-03-17 23:33 ` [PATCH 02/21] fat: move fs/vfat/* and fs/msdos/* to fs/fat Pozsar Balazs
2008-10-15 22:07 ` [PATCH 01/21] fat: document additional vfat mount options Andrew Morton
2008-10-15 23:04 ` OGAWA Hirofumi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26b742873e848f5f6e92122369.ps@mail.parknet.co.jp \
--to=hirofumi@mail.parknet.co.jp \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®