From 5c189709c987cf505ae2aabdfbfa93d796444c01 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Thu, 21 Jul 2022 12:08:05 +0900 Subject: [PATCH] exfat: simplified by using round_up() Signed-off-by: Christophe Vu-Brugier Signed-off-by: Namjae Jeon --- file.c | 4 ++-- inode.c | 4 ++-- super.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/file.c b/file.c index 713735143589..6e37277bbd84 100644 --- a/file.c +++ b/file.c @@ -222,8 +222,8 @@ void exfat_truncate(struct inode *inode, loff_t size) if (err) goto write_size; - inode->i_blocks = ((i_size_read(inode) + (sbi->cluster_size - 1)) & - ~((loff_t)sbi->cluster_size - 1)) >> inode->i_blkbits; + inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> + inode->i_blkbits; write_size: aligned_size = i_size_read(inode); if (aligned_size & (blocksize - 1)) { diff --git a/inode.c b/inode.c index 28692a095974..f3dbeb300c64 100644 --- a/inode.c +++ b/inode.c @@ -646,8 +646,8 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info) exfat_save_attr(inode, info->attr); - inode->i_blocks = ((i_size_read(inode) + (sbi->cluster_size - 1)) & - ~((loff_t)sbi->cluster_size - 1)) >> inode->i_blkbits; + inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> + inode->i_blkbits; inode->i_mtime = info->mtime; inode->i_ctime = info->mtime; ei->i_crtime = info->crtime; diff --git a/super.c b/super.c index f672249dde22..cd6a54d0cab4 100644 --- a/super.c +++ b/super.c @@ -632,8 +632,8 @@ static int exfat_read_root(struct inode *inode) inode->i_op = &exfat_dir_inode_operations; inode->i_fop = &exfat_dir_operations; - inode->i_blocks = ((i_size_read(inode) + (sbi->cluster_size - 1)) & - ~((loff_t)sbi->cluster_size - 1)) >> inode->i_blkbits; + inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> + inode->i_blkbits; ei->i_pos = ((loff_t)sbi->root_dir << 32) | 0xffffffff; ei->i_size_aligned = i_size_read(inode); ei->i_size_ondisk = i_size_read(inode);