From b0e899b4855b64d16c4da0d8a1ced7bae7ab920e Mon Sep 17 00:00:00 2001
From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Thu, 6 Nov 2008 12:53:58 -0800
Subject: [PATCH] --- yaml --- r: 118469 b: refs/heads/master c:
 c3302931db090d87e9015c3a7ce5c97a7dd90f78 h: refs/heads/master i:   118467:
 61f5825704f4601e2f09e5107f211c380a6bae49 v: v3

---
 [refs]                | 2 +-
 trunk/fs/fat/dir.c    | 2 +-
 trunk/fs/fat/fat.h    | 3 +++
 trunk/fs/fat/fatent.c | 5 ++---
 trunk/fs/fat/misc.c   | 5 +++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4f6c7572282e..0400b76022de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ca59f4c3d28df14a1545a1e2832f34a0a50e3ed
+refs/heads/master: c3302931db090d87e9015c3a7ce5c97a7dd90f78
diff --git a/trunk/fs/fat/dir.c b/trunk/fs/fat/dir.c
index 2ecaa17acdb5..67e058357098 100644
--- a/trunk/fs/fat/dir.c
+++ b/trunk/fs/fat/dir.c
@@ -86,7 +86,7 @@ static int fat__get_entry(struct inode *dir, loff_t *pos,
 	*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 --git a/trunk/fs/fat/fat.h b/trunk/fs/fat/fat.h
index 4efc5038ed29..ea440d65819c 100644
--- a/trunk/fs/fat/fat.h
+++ b/trunk/fs/fat/fat.h
@@ -323,4 +323,7 @@ extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs);
 int fat_cache_init(void);
 void fat_cache_destroy(void);
 
+/* helper for printk */
+typedef unsigned long long	llu;
+
 #endif /* !_FAT_H */
diff --git a/trunk/fs/fat/fatent.c b/trunk/fs/fat/fatent.c
index 13513992da3c..da6eea47872f 100644
--- a/trunk/fs/fat/fatent.c
+++ b/trunk/fs/fat/fatent.c
@@ -93,8 +93,7 @@ static int fat12_ent_bread(struct super_block *sb, struct fat_entry *fatent,
 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_block *sb, struct fat_entry *fatent,
 	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;
diff --git a/trunk/fs/fat/misc.c b/trunk/fs/fat/misc.c
index a191e79e66a9..ac39ebcc1496 100644
--- a/trunk/fs/fat/misc.c
+++ b/trunk/fs/fat/misc.c
@@ -124,8 +124,9 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster)
 			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);