From: Andrew Morton <akpm@linux-foundation.org>
Date: Sat, 3 Nov 2012 00:42:58 +0000 (+1100)
Subject: fat-exportfs-rebuild-inode-if-ilookup-fails-fix
X-Git-Tag: next-20121108~1^2~43
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74ee704c490b2d9297ab3c476caa744c2dc17362;p=karo-tx-linux.git

fat-exportfs-rebuild-inode-if-ilookup-fails-fix

fix warnings/types

fs/fat/nfs.c: In function 'fat_nfs_get_inode':
fs/fat/nfs.c:68: warning: passing argument 3 of 'fat_get_blknr_offset' from incompatible pointer type
fs/fat/fat.h:218: note: expected 'sector_t *' but argument is of type 'loff_t *'
fs/fat/inode.c: In function '__fat_write_inode':
fs/fat/inode.c:630: warning: passing argument 3 of 'fat_get_blknr_offset' from incompatible pointer type
fs/fat/fat.h:218: note: expected 'sector_t *' but argument is of type 'loff_t *'

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Amit Sahrawat <a.sahrawat@samsung.com>
Cc: Namjae Jeon <namjae.jeon@samsung.com>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Ravishankar N <ravi.n1@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 303dca2c42e4..80c6fddee396 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -616,7 +616,8 @@ static int __fat_write_inode(struct inode *inode, int wait)
 	struct msdos_sb_info *sbi = MSDOS_SB(sb);
 	struct buffer_head *bh;
 	struct msdos_dir_entry *raw_entry;
-	loff_t i_pos, blocknr;
+	loff_t i_pos;
+	sector_t blocknr;
 	int offset, err;
 
 	if (inode->i_ino == MSDOS_ROOT_INO)
diff --git a/fs/fat/nfs.c b/fs/fat/nfs.c
index 156903bc22d9..a1c5771b8314 100644
--- a/fs/fat/nfs.c
+++ b/fs/fat/nfs.c
@@ -63,7 +63,7 @@ static struct inode *fat_nfs_get_inode(struct super_block *sb,
 	if (inode == NULL && MSDOS_SB(sb)->options.nfs == FAT_NFS_NOSTALE_RO) {
 		struct buffer_head *bh = NULL;
 		struct msdos_dir_entry *de ;
-		loff_t blocknr;
+		sector_t blocknr;
 		int offset;
 		fat_get_blknr_offset(MSDOS_SB(sb), i_pos, &blocknr, &offset);
 		bh = sb_bread(sb, blocknr);