From mboxrd@z Thu Jan 1 00:00:00 1970 From: Seunghun Lee Subject: [PATCH] fat: Simplify calc_fat_clusters code Date: Tue, 2 Sep 2014 22:33:30 +0900 Message-ID: <1409664810-31960-1-git-send-email-waydi1@gmail.com> Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Seunghun Lee To: hirofumi@mail.parknet.co.jp Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Code for fat12 and fat16/32 can be merged to one. Signed-off-by: Seunghun Lee --- 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