From b859ea17dfbd7ff8c9c1085fe0a3b26f218fe048 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 25 Oct 2012 12:15:14 +1100 Subject: [PATCH] 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" Cc: Amit Sahrawat Cc: Namjae Jeon Cc: OGAWA Hirofumi Cc: Ravishankar N Signed-off-by: Andrew Morton --- fs/fat/inode.c | 3 ++- fs/fat/nfs.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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); -- 2.39.5