exfat: aggregate dir-entry updates into __exfat_write_inode().
Subsystems (2)
PATCH v4 2/2 exfat: aggregate dir-entry updates into __exfat_write_inode().
The following function writes the updated inode information as dir-entry by themselves.
- __exfat_truncate()
- exfat_map_cluster()
- exfat_find_empty_entry()
Aggregate these writes into __exfat_write_inode().
In exfat_map_cluster(), the value obtained from i_size_read() is set to stream.valid_size and stream.size.
However, in the context of get_block(), inode->i_size has not been set yet, so the same value as current will be set, which is a meaningless update. Furthermore, if it is called with previous size=0, the newly allocated cluster number will be set to stream.start_clu, and stream.valid_size/size will be 0, which is illegal.
Update stream.valid_size/size and stream.start_clu when __exfat_write_inode is called after i_size is set, to prevent meaningless/illegal updates.
Others:
- Remove double inode-update in __exfat_truncate() and exfat_truncate().
- In __exfat_write_inode(), rename 'on_disk_size' to 'filesize' and add adjustment when filesize is 0.
---
Changes in v4
- Remove debug message
Changes in v3
- Remove update_inode() in exfat_map_cluster()/exfat_truncate()
- Update commit-message
Changes in v2
- Fix endian issue
fs/exfat/file.c | 52 +++++------------------------------------------- fs/exfat/inode.c | 42 +++++++------------------------------- fs/exfat/namei.c | 26 +++++------------------- 3 files changed, 17 insertions(+), 103 deletions(-)
fs/exfat/file.c +5 -47
@@ -100,7 +100,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)struct super_block *sb = inode->i_sb;struct exfat_sb_info *sbi =EXFAT_SB (sb);struct exfat_inode_info *ei =EXFAT_I (inode); -int evict = (ei->dir.dir ==DIR_DELETED ) ?1 :0 ; +int ret;/* check if the given file ID is opened */ if (ei->type !=TYPE_FILE && ei->type !=TYPE_DIR )
@@ -150,49 +150,10 @@ int __exfat_truncate(struct inode *inode, loff_t new_size) ei->attr |=ATTR_ARCHIVE ;/* update the directory entry */ -if (!evict) { -struct timespec64 ts; -struct exfat_dentry *ep, *ep2; -struct exfat_entry_set_cache *es; -int err; - - es =exfat_get_dentry_set (sb, &(ei->dir), ei->entry, -ES_ALL_ENTRIES ); -if (!es) -return -EIO ; - ep =exfat_get_dentry_cached (es,0 ); - ep2 =exfat_get_dentry_cached (es,1 ); - - ts =current_time (inode); -exfat_set_entry_time (sbi, &ts, - &ep->dentry.file.modify_tz, - &ep->dentry.file.modify_time, - &ep->dentry.file.modify_date, - &ep->dentry.file.modify_time_cs); - ep->dentry.file.attr =cpu_to_le16 (ei->attr); - -/* File size should be zero if there is no cluster allocated */ -if (ei->start_clu ==EXFAT_EOF_CLUSTER ) { - ep2->dentry.stream.valid_size =0 ; - ep2->dentry.stream.size =0 ; - }else { - ep2->dentry.stream.valid_size =cpu_to_le64 (new_size); - ep2->dentry.stream.size = ep2->dentry.stream.valid_size; - } - -if (new_size ==0 ) { -/* Any directory can not be truncated to zero */ -WARN_ON (ei->type !=TYPE_FILE ); - - ep2->dentry.stream.flags =ALLOC_FAT_CHAIN ; - ep2->dentry.stream.start_clu =EXFAT_FREE_CLUSTER ; - } - -exfat_update_dir_chksum_with_entry_set (es); - err =exfat_free_dentry_set (es,inode_needs_sync (inode)); -if (err) -return err; - } + inode->i_ctime = inode->i_mtime =current_time (inode); + ret =exfat_update_inode (inode); +if (ret) +return ret;/* cut off from the FAT chain */ if (ei->flags == ALLOC_FAT_CHAIN && last_clu != EXFAT_FREE_CLUSTER &&
@@ -244,9 +205,6 @@ void exfat_truncate(struct inode *inode, loff_t size)if (err) goto write_size; - inode->i_ctime = inode->i_mtime =current_time (inode); -exfat_update_inode (inode); - inode->i_blocks = ((i_size_read (inode) + (sbi->cluster_size -1 )) & ~(sbi->cluster_size -1 )) >> inode->i_blkbits; write_size:
fs/exfat/inode.c +7 -35
81 lines not on this page · raw message
fs/exfat/namei.c +5 -21
@@ -306,10 +306,8 @@ static int exfat_find_empty_entry(struct inode *inode, {int dentry;unsigned int ret, last_clu; -sector_t sector;loff_t size =0 ;struct exfat_chain clu; -struct exfat_dentry *ep =NULL ;struct super_block *sb = inode->i_sb;struct exfat_sb_info *sbi =EXFAT_SB (sb);struct exfat_inode_info *ei =EXFAT_I (inode);
@@ -374,31 +372,17 @@ static int exfat_find_empty_entry(struct inode *inode, p_dir->size++; size =EXFAT_CLU_TO_B (p_dir->size, sbi); -/* update the directory entry */ -if (p_dir->dir != sbi->root_dir) { -struct buffer_head *bh; - - ep =exfat_get_dentry (sb, - &(ei->dir), ei->entry +1 , &bh, §or); -if (!ep) -return -EIO ; - - ep->dentry.stream.valid_size =cpu_to_le64 (size); - ep->dentry.stream.size = ep->dentry.stream.valid_size; - ep->dentry.stream.flags = p_dir->flags; -exfat_update_bh (bh,IS_DIRSYNC (inode)); -brelse (bh); -if (exfat_update_dir_chksum (inode, &(ei->dir), - ei->entry)) -return -EIO ; - } -/* directory inode should be updated in here */ i_size_write (inode, size);EXFAT_I (inode)->i_size_ondisk += sbi->cluster_size;EXFAT_I (inode)->i_size_aligned += sbi->cluster_size;EXFAT_I (inode)->flags = p_dir->flags; inode->i_blocks +=1 << sbi->sect_per_clus_bits; + +/* update the directory entry */ + ret =exfat_update_inode (inode); +if (ret) +return ret; }return dentry;
Signature · 1 line
2.25.1