Skip to content

Commit ad57a10

Browse files
committed
Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat
Pull exfat update from Namjae Jeon: "Bug fixes: - Fix memory leak on mount failure with iocharset= option - Fix incorrect update of stream entry - Fix cluster range validation error Clean-ups: - Remove unused code and unneeded assignment - Rename variables in exfat structure as specification - Reorganize boot sector analysis code - Simplify exfat_utf8_d_hash and exfat_utf8_d_cmp() - Optimize exfat entry cache functions - Improve wording of EXFAT_DEFAULT_IOCHARSET config option New Feature: - Add boot region verification" * tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat: exfat: Fix potential use after free in exfat_load_upcase_table() exfat: fix range validation error in alloc and free cluster exfat: fix incorrect update of stream entry in __exfat_truncate() exfat: fix memory leak in exfat_parse_param() exfat: remove unnecessary reassignment of p_uniname->name_len exfat: standardize checksum calculation exfat: add boot region verification exfat: separate the boot sector analysis exfat: redefine PBR as boot_sector exfat: optimize dir-cache exfat: replace 'time_ms' with 'time_cs' exfat: remove the assignment of 0 to bool variable exfat: Remove unused functions exfat_high_surrogate() and exfat_low_surrogate() exfat: Simplify exfat_utf8_d_hash() for code points above U+FFFF exfat: Improve wording of EXFAT_DEFAULT_IOCHARSET config option exfat: Use a more common logging style exfat: Simplify exfat_utf8_d_cmp() for code points above U+FFFF
2 parents 3beff76 + fc96152 commit ad57a10

File tree

12 files changed

+423
-469
lines changed

12 files changed

+423
-469
lines changed

fs/exfat/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ config EXFAT_DEFAULT_IOCHARSET
1616
depends on EXFAT_FS
1717
help
1818
Set this to the default input/output character set to use for
19-
converting between the encoding is used for user visible filename and
20-
UTF-16 character that exfat filesystem use, and can be overridden with
21-
the "iocharset" mount option for exFAT filesystems.
19+
converting between the encoding that is used for user visible
20+
filenames and the UTF-16 character encoding that the exFAT
21+
filesystem uses. This can be overridden with the "iocharset" mount
22+
option for the exFAT filesystems.

fs/exfat/balloc.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ static int exfat_allocate_bitmap(struct super_block *sb,
5858
need_map_size = ((EXFAT_DATA_CLUSTER_COUNT(sbi) - 1) / BITS_PER_BYTE)
5959
+ 1;
6060
if (need_map_size != map_size) {
61-
exfat_msg(sb, KERN_ERR,
62-
"bogus allocation bitmap size(need : %u, cur : %lld)",
63-
need_map_size, map_size);
61+
exfat_err(sb, "bogus allocation bitmap size(need : %u, cur : %lld)",
62+
need_map_size, map_size);
6463
/*
6564
* Only allowed when bogus allocation
6665
* bitmap size is large
@@ -192,8 +191,7 @@ void exfat_clear_bitmap(struct inode *inode, unsigned int clu)
192191
(1 << sbi->sect_per_clus_bits), GFP_NOFS, 0);
193192

194193
if (ret_discard == -EOPNOTSUPP) {
195-
exfat_msg(sb, KERN_ERR,
196-
"discard not supported by device, disabling");
194+
exfat_err(sb, "discard not supported by device, disabling");
197195
opts->discard = 0;
198196
}
199197
}

0 commit comments

Comments
 (0)