Commit f6a975c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: fat16 support maximum 4GB file/vol size as WinXP or 7.
  fat: fix utf8 iocharset warning message
  fat: fix build warning
parents d522a0d1 710d4403

fs/fat/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,7 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots, 
	struct super_block *sb = dir->i_sb;

	struct msdos_sb_info *sbi = MSDOS_SB(sb);

	struct buffer_head *bh, *prev, *bhs[3]; /* 32*slots (672bytes) */

	struct msdos_dir_entry *de;

	struct msdos_dir_entry *uninitialized_var(de);

	int err, free_slots, i, nr_bhs;

	loff_t pos, i_pos;

fs/fat/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -1188,9 +1188,9 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat, 
out:

	/* UTF-8 doesn't provide FAT semantics */

	if (!strcmp(opts->iocharset, "utf8")) {

		fat_msg(sb, KERN_ERR, "utf8 is not a recommended IO charset"

		fat_msg(sb, KERN_WARNING, "utf8 is not a recommended IO charset"

		       " for FAT filesystems, filesystem will be "

		       "case sensitive!\n");

		       "case sensitive!");

	}



	/* If user doesn't specify allow_utime, it's initialized from dmask. */
@@ -1367,6 +1367,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, 
	sbi->free_clusters = -1;	/* Don't know yet */

	sbi->free_clus_valid = 0;

	sbi->prev_free = FAT_START_ENT;

	sb->s_maxbytes = 0xffffffff;



	if (!sbi->fat_length && b->fat32_length) {

		struct fat_boot_fsinfo *fsinfo;
@@ -1377,8 +1378,6 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, 
		sbi->fat_length = le32_to_cpu(b->fat32_length);

		sbi->root_cluster = le32_to_cpu(b->root_cluster);



		sb->s_maxbytes = 0xffffffff;



		/* MC - if info_sector is 0, don't multiply by 0 */

		sbi->fsinfo_sector = le16_to_cpu(b->info_sector);

		if (sbi->fsinfo_sector == 0)