Code for fat12 and fat16/32 can be merged to one. Signed-off-by: Seunghun Lee <waydi1@xxxxxxxxx> --- fs/fat/inode.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 756aead..6992dea 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1307,12 +1307,9 @@ static unsigned long calc_fat_clusters(struct super_block *sb) struct msdos_sb_info *sbi = MSDOS_SB(sb); /* Divide first to avoid overflow */ - if (sbi->fat_bits != 12) { - unsigned long ent_per_sec = sb->s_blocksize * 8 / sbi->fat_bits; - return ent_per_sec * sbi->fat_length; - } + unsigned long ent_per_sec = sb->s_blocksize * 8 / sbi->fat_bits; - return sbi->fat_length * sb->s_blocksize * 8 / sbi->fat_bits; + return ent_per_sec * sbi->fat_length; } static bool fat_bpb_is_zero(struct fat_boot_sector *b) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html