Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eef5404 authored Jan 08, 2023 by Namjae Jeon

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: 98d917047e8b ("exfat: add file operations")
Cc: stable@vger.kernel.org # v5.7+
Reported-by: Wang Yugui <wangyugui@e16-tech.com>
Tested-by: Wang Yugui <wangyugui@e16-tech.com>
Signed-off-by: Yuezhang Mo <Yuezhang.Mo@sony.com>
Reviewed-by: Andy Wu <Andy.Wu@sony.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>

parent 17d8731c

file.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -220,8 +220,7 @@ void exfat_truncate(struct inode *inode)
	if (err)		if (err)
	goto write_size;		goto write_size;

	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>		inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;
	inode->i_blkbits;
	write_size:		write_size:
	aligned_size = i_size_read(inode);		aligned_size = i_size_read(inode);
	if (aligned_size & (blocksize - 1)) {		if (aligned_size & (blocksize - 1)) {

inode.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -222,8 +222,7 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,
	num_clusters += num_to_be_allocated;		num_clusters += num_to_be_allocated;
	*clu = new_clu.dir;		*clu = new_clu.dir;

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

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

	exfat_save_attr(inode, info->attr);		exfat_save_attr(inode, info->attr);

	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>		inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;
	inode->i_blkbits;
	inode->i_mtime = info->mtime;		inode->i_mtime = info->mtime;
	inode->i_ctime = info->mtime;		inode->i_ctime = info->mtime;
	ei->i_crtime = info->crtime;		ei->i_crtime = info->crtime;

namei.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -423,7 +423,7 @@ static int exfat_find_empty_entry(struct inode *inode,
	ei->i_size_ondisk += sbi->cluster_size;		ei->i_size_ondisk += sbi->cluster_size;
	ei->i_size_aligned += sbi->cluster_size;		ei->i_size_aligned += sbi->cluster_size;
	ei->flags = p_dir->flags;		ei->flags = p_dir->flags;
	inode->i_blocks += 1 << sbi->sect_per_clus_bits;		inode->i_blocks += sbi->cluster_size >> 9;
	}		}

	return dentry;		return dentry;

super.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -632,8 +632,7 @@ static int exfat_read_root(struct inode *inode)
	inode->i_op = &exfat_dir_inode_operations;		inode->i_op = &exfat_dir_inode_operations;
	inode->i_fop = &exfat_dir_operations;		inode->i_fop = &exfat_dir_operations;

	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>		inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;
	inode->i_blkbits;
	ei->i_pos = ((loff_t)sbi->root_dir << 32) \| 0xffffffff;		ei->i_pos = ((loff_t)sbi->root_dir << 32) \| 0xffffffff;
	ei->i_size_aligned = i_size_read(inode);		ei->i_size_aligned = i_size_read(inode);
	ei->i_size_ondisk = i_size_read(inode);		ei->i_size_ondisk = i_size_read(inode);