Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-5
+1
-1
fs/fat/dir.c
+1
-1
fs/fat/dir.c
···
1231
1231
struct super_block *sb = dir->i_sb;
1232
1232
struct msdos_sb_info *sbi = MSDOS_SB(sb);
1233
1233
struct buffer_head *bh, *prev, *bhs[3]; /* 32*slots (672bytes) */
1234
-
struct msdos_dir_entry *de;
1234
+
struct msdos_dir_entry *uninitialized_var(de);
1235
1235
int err, free_slots, i, nr_bhs;
1236
1236
loff_t pos, i_pos;
1237
1237
+3
-4
fs/fat/inode.c
+3
-4
fs/fat/inode.c
···
1188
1188
out:
1189
1189
/* UTF-8 doesn't provide FAT semantics */
1190
1190
if (!strcmp(opts->iocharset, "utf8")) {
1191
-
fat_msg(sb, KERN_ERR, "utf8 is not a recommended IO charset"
1191
+
fat_msg(sb, KERN_WARNING, "utf8 is not a recommended IO charset"
1192
1192
" for FAT filesystems, filesystem will be "
1193
-
"case sensitive!\n");
1193
+
"case sensitive!");
1194
1194
}
1195
1195
1196
1196
/* If user doesn't specify allow_utime, it's initialized from dmask. */
···
1367
1367
sbi->free_clusters = -1; /* Don't know yet */
1368
1368
sbi->free_clus_valid = 0;
1369
1369
sbi->prev_free = FAT_START_ENT;
1370
+
sb->s_maxbytes = 0xffffffff;
1370
1371
1371
1372
if (!sbi->fat_length && b->fat32_length) {
1372
1373
struct fat_boot_fsinfo *fsinfo;
···
1377
1376
sbi->fat_bits = 32;
1378
1377
sbi->fat_length = le32_to_cpu(b->fat32_length);
1379
1378
sbi->root_cluster = le32_to_cpu(b->root_cluster);
1380
-
1381
-
sb->s_maxbytes = 0xffffffff;
1382
1379
1383
1380
/* MC - if info_sector is 0, don't multiply by 0 */
1384
1381
sbi->fsinfo_sector = le16_to_cpu(b->info_sector);