Commit 39c1ce8e authored by Yuezhang Mo's avatar Yuezhang Mo Committed by Namjae Jeon
Browse files

exfat: fix inode->i_blocks for non-512 byte sector size device 



inode->i_blocks is not real number of blocks, but 512 byte ones.

Fixes: 98d91704 ("exfat: add file operations")
Cc: stable@vger.kernel.org # v5.7+
Reported-by: default avatarWang Yugui <wangyugui@e16-tech.com>
Tested-by: default avatarWang Yugui <wangyugui@e16-tech.com>
Signed-off-by: default avatarYuezhang Mo <Yuezhang.Mo@sony.com>
Reviewed-by: default avatarAndy Wu <Andy.Wu@sony.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
parent bdaadfd3

fs/exfat/file.c

+1 −2
Original line number Diff line number Diff line
@@ -209,8 +209,7 @@ void exfat_truncate(struct inode *inode) 
	if (err)

		goto write_size;



	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>

				inode->i_blkbits;

	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;

write_size:

	aligned_size = i_size_read(inode);

	if (aligned_size & (blocksize - 1)) {

fs/exfat/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -220,8 +220,7 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset, 
		num_clusters += num_to_be_allocated;

		*clu = new_clu.dir;



		inode->i_blocks +=

			num_to_be_allocated << sbi->sect_per_clus_bits;

		inode->i_blocks += EXFAT_CLU_TO_B(num_to_be_allocated, sbi) >> 9;



		/*

		 * Move *clu pointer along FAT chains (hole care) because the
@@ -576,8 +575,7 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info) 


	exfat_save_attr(inode, info->attr);



	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>

				inode->i_blkbits;

	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;

	inode->i_mtime = info->mtime;

	inode->i_ctime = info->mtime;

	ei->i_crtime = info->crtime;

fs/exfat/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int exfat_find_empty_entry(struct inode *inode, 
		ei->i_size_ondisk += sbi->cluster_size;

		ei->i_size_aligned += sbi->cluster_size;

		ei->flags = p_dir->flags;

		inode->i_blocks += 1 << sbi->sect_per_clus_bits;

		inode->i_blocks += sbi->cluster_size >> 9;

	}



	return dentry;

fs/exfat/super.c

+1 −2
Original line number Diff line number Diff line
@@ -373,8 +373,7 @@ static int exfat_read_root(struct inode *inode) 
	inode->i_op = &exfat_dir_inode_operations;

	inode->i_fop = &exfat_dir_operations;



	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>

				inode->i_blkbits;

	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;

	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);