exfat: write multiple sectors at once
Subsystems (2)
PATCH v4 1/2 exfat: write multiple sectors at once
Write multiple sectors at once when updating dir-entries. Add exfat_update_bhs() for that. It wait for write completion once instead of sector by sector.
It's only effective if sync enabled.
---
Changes in v2:
- Split into 'write multiple sectors at once' and 'add error check when updating dir-entries'
Changes in v3
- Rebase to latest exfat-dev
Changes in v4
- Use if/else instead of conditional operator
fs/exfat/dir.c | 15 +++++++++------ fs/exfat/exfat_fs.h | 1 + fs/exfat/misc.c | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-)
fs/exfat/dir.c +9 -6
@@ -606,13 +606,16 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es)void exfat_free_dentry_set (struct exfat_entry_set_cache *es,int sync) { -int i; +int i, err =0 ; -for (i =0 ; i < es->num_bh; i++) { -if (es->modified) -exfat_update_bh (es->bh[i], sync); -brelse (es->bh[i]); - } +if (es->modified) + err =exfat_update_bhs (es->bh, es->num_bh, sync); + +for (i =0 ; i < es->num_bh; i++) +if (err) +bforget (es->bh[i]); +else +brelse (es->bh[i]);kfree (es); }
fs/exfat/exfat_fs.h +1 -0
@@ -512,6 +512,7 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,u16 exfat_calc_chksum16 (void *data,int len,u16 chksum,int type);u32 exfat_calc_chksum32 (void *data,int len,u32 chksum,int type);void exfat_update_bh (struct buffer_head *bh,int sync); +int exfat_update_bhs (struct buffer_head **bhs,int nr_bhs,int sync);void exfat_chain_set (struct exfat_chain *ec,unsigned int dir,unsigned int size,unsigned char flags);void exfat_chain_dup (struct exfat_chain *dup,struct exfat_chain *ec);
fs/exfat/misc.c +19 -0
@@ -172,6 +172,25 @@ void exfat_update_bh(struct buffer_head *bh, int sync)sync_dirty_buffer (bh); } +int exfat_update_bhs (struct buffer_head **bhs,int nr_bhs,int sync) +{ +int i, err =0 ; + +for (i =0 ; i < nr_bhs; i++) { +set_buffer_uptodate (bhs[i]); +mark_buffer_dirty (bhs[i]); +if (sync) +write_dirty_buffer (bhs[i],0 ); + } + +for (i =0 ; i < nr_bhs && sync; i++) { +wait_on_buffer (bhs[i]); +if (!buffer_uptodate (bhs[i])) + err = -EIO ; + } +return err; +} +void exfat_chain_set (struct exfat_chain *ec,unsigned int dir,unsigned int size,unsigned char flags) {
Signature · 1 line
2.25.1
PATCH v4 2/2 exfat: add error check when updating dir-entries
Add error check when synchronously updating dir-entries.
---
Changes in v2:
- Split into 'write multiple sectors at once' and 'add error check when updating dir-entries'
Changes in v3
- Rebase to latest exfat-dev
Changes in v4
- Based on 'exfat: write multiple sectors at once' v4
fs/exfat/dir.c | 3 ++- fs/exfat/exfat_fs.h | 2 +- fs/exfat/file.c | 5 ++++- fs/exfat/inode.c | 8 +++++--- 4 files changed, 12 insertions(+), 6 deletions(-)
fs/exfat/dir.c +2 -1
@@ -604,7 +604,7 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es) es->modified = true; } -void exfat_free_dentry_set (struct exfat_entry_set_cache *es,int sync) +int exfat_free_dentry_set (struct exfat_entry_set_cache *es,int sync) {int i, err =0 ;
@@ -617,6 +617,7 @@ void exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync)else brelse (es->bh[i]);kfree (es); +return err; } static int exfat_walk_fat_chain(struct super_block *sb,
fs/exfat/exfat_fs.h +1 -1
@@ -459,7 +459,7 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es, int num);struct exfat_entry_set_cache *exfat_get_dentry_set (struct super_block *sb,struct exfat_chain *p_dir,int entry,unsigned int type); -void exfat_free_dentry_set (struct exfat_entry_set_cache *es,int sync); +int exfat_free_dentry_set (struct exfat_entry_set_cache *es,int sync);int exfat_count_dir_entries (struct super_block *sb,struct exfat_chain *p_dir);/* inode.c */
fs/exfat/file.c +4 -1
@@ -153,6 +153,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)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 );
@@ -187,7 +188,9 @@ int __exfat_truncate(struct inode *inode, loff_t new_size) }exfat_update_dir_chksum_with_entry_set (es); -exfat_free_dentry_set (es,inode_needs_sync (inode)); + err =exfat_free_dentry_set (es,inode_needs_sync (inode)); +if (err) +return err; }/* cut off from the FAT chain */
fs/exfat/inode.c +5 -3
@@ -77,8 +77,7 @@ static int __exfat_write_inode(struct inode *inode, int sync) ep2->dentry.stream.size = ep2->dentry.stream.valid_size;exfat_update_dir_chksum_with_entry_set (es); -exfat_free_dentry_set (es, sync); -return 0 ; +return exfat_free_dentry_set (es, sync); }int exfat_write_inode (struct inode *inode,struct writeback_control *wbc)
@@ -222,6 +221,7 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,if (ei->dir.dir !=DIR_DELETED && modified) {struct exfat_dentry *ep;struct exfat_entry_set_cache *es; +int err; es =exfat_get_dentry_set (sb, &(ei->dir), ei->entry,ES_ALL_ENTRIES );
@@ -240,7 +240,9 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset, ep->dentry.stream.valid_size;exfat_update_dir_chksum_with_entry_set (es); -exfat_free_dentry_set (es,inode_needs_sync (inode)); + err =exfat_free_dentry_set (es,inode_needs_sync (inode)); +if (err) +return err; }/* end of if != DIR_DELETED */
Signature · 1 line
2.25.1
Namjae Jeon
maintainer2020-06-19 17:38 GMT+09:00, Tetsuhiro Kohada <[email protected]>:
Quoted 6 lines
Write multiple sectors at once when updating dir-entries. Add
exfat_update_bhs()for that. It wait for write completion once instead of sector by sector.
It's only effective if sync enabled.Reviewed-by Christoph Hellwig <[email protected]>
He didn't give reviewed-by tag for this patch.
You shouldn't add it at will.
Quoted 1 line
Signed-off-by Tetsuhiro Kohada <[email protected]>
Quoted 9 lines
2020-06-19 17:38 GMT+09:00, Tetsuhiro Kohada <[email protected]>:
Quoted 6 lines
Write multiple sectors at once when updating dir-entries. Add
exfat_update_bhs()for that. It wait for write completion once instead of sector by sector.
It's only effective if sync enabled.Reviewed-by Christoph Hellwig <[email protected]>He didn't give reviewed-by tag for this patch.
You shouldn't add it at will.
I understand.
Should I remove reviewed-by tag and repost the patch?
BR
---
Kohada Tetsuhiro <[email protected]>