Skip to content

Commit f7cde96

Browse files
YuezhangMonamjaejeon
authored andcommitted
exfat: remove i_size_write() from __exfat_truncate()
The file/directory size is updated into inode by i_size_write() before __exfat_truncate() is called, so it is redundant to re-update by i_size_write() in __exfat_truncate(). Code refinement, no functional changes. Signed-off-by: Yuezhang Mo <[email protected]> Reviewed-by: Andy Wu <[email protected]> Reviewed-by: Aoyama Wataru <[email protected]> Reviewed-by: Sungjong Seo <[email protected]> Signed-off-by: Namjae Jeon <[email protected]>
1 parent e981917 commit f7cde96

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

fs/exfat/exfat_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ int exfat_trim_fs(struct inode *inode, struct fstrim_range *range);
448448

449449
/* file.c */
450450
extern const struct file_operations exfat_file_operations;
451-
int __exfat_truncate(struct inode *inode, loff_t new_size);
451+
int __exfat_truncate(struct inode *inode);
452452
void exfat_truncate(struct inode *inode);
453453
int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
454454
struct iattr *attr);

fs/exfat/file.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static int exfat_sanitize_mode(const struct exfat_sb_info *sbi,
9393
}
9494

9595
/* resize the file length */
96-
int __exfat_truncate(struct inode *inode, loff_t new_size)
96+
int __exfat_truncate(struct inode *inode)
9797
{
9898
unsigned int num_clusters_new, num_clusters_phys;
9999
unsigned int last_clu = EXFAT_FREE_CLUSTER;
@@ -113,7 +113,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
113113

114114
exfat_chain_set(&clu, ei->start_clu, num_clusters_phys, ei->flags);
115115

116-
if (new_size > 0) {
116+
if (i_size_read(inode) > 0) {
117117
/*
118118
* Truncate FAT chain num_clusters after the first cluster
119119
* num_clusters = min(new, phys);
@@ -143,8 +143,6 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
143143
ei->start_clu = EXFAT_EOF_CLUSTER;
144144
}
145145

146-
i_size_write(inode, new_size);
147-
148146
if (ei->type == TYPE_FILE)
149147
ei->attr |= ATTR_ARCHIVE;
150148

@@ -207,7 +205,7 @@ void exfat_truncate(struct inode *inode)
207205
goto write_size;
208206
}
209207

210-
err = __exfat_truncate(inode, i_size_read(inode));
208+
err = __exfat_truncate(inode);
211209
if (err)
212210
goto write_size;
213211

fs/exfat/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ void exfat_evict_inode(struct inode *inode)
626626
if (!inode->i_nlink) {
627627
i_size_write(inode, 0);
628628
mutex_lock(&EXFAT_SB(inode->i_sb)->s_lock);
629-
__exfat_truncate(inode, 0);
629+
__exfat_truncate(inode);
630630
mutex_unlock(&EXFAT_SB(inode->i_sb)->s_lock);
631631
}
632632

0 commit comments

Comments
 (0)