From 4d1f809462d275f079d837cf1e4516b04b053efa Mon Sep 17 00:00:00 2001 From: Hirofumi Ogawa Date: Tue, 19 Oct 2004 18:16:15 -0700 Subject: [PATCH] [PATCH] FAT: merge fix Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/fat/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fat/inode.c b/fs/fat/inode.c index ba1fb521f52d0..2673d8779cdc5 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -32,7 +32,7 @@ static int fat_default_codepage = CONFIG_FAT_DEFAULT_CODEPAGE; static char fat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET; static int fat_statfs(struct super_block *sb, struct kstatfs *buf); -static void fat_write_inode(struct inode *inode, int wait); +static int fat_write_inode(struct inode *inode, int wait); /* * New FAT inode stuff. We do the following: @@ -1233,7 +1233,7 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) return 0; } -int fat_write_inode(struct inode *inode, int wait) +static int fat_write_inode(struct inode *inode, int wait) { struct super_block *sb = inode->i_sb; struct msdos_sb_info *sbi = MSDOS_SB(sb); -- 2.53.0