Commit 8b0c4717 authored by Tetsuhiro Kohada's avatar Tetsuhiro Kohada Committed by Namjae Jeon

exfat: add error check when updating dir-entries

Add error check when synchronously updating dir-entries.
Suggested-by: default avatarSungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: default avatarTetsuhiro Kohada <kohada.t2@gmail.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
parent 3db3c3fb
...@@ -604,7 +604,7 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es) ...@@ -604,7 +604,7 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es)
es->modified = true; 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; int i, err = 0;
...@@ -617,6 +617,7 @@ void exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync) ...@@ -617,6 +617,7 @@ void exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync)
else else
brelse(es->bh[i]); brelse(es->bh[i]);
kfree(es); kfree(es);
return err;
} }
static int exfat_walk_fat_chain(struct super_block *sb, static int exfat_walk_fat_chain(struct super_block *sb,
......
...@@ -460,7 +460,7 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es, ...@@ -460,7 +460,7 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es,
int num); int num);
struct exfat_entry_set_cache *exfat_get_dentry_set(struct super_block *sb, struct exfat_entry_set_cache *exfat_get_dentry_set(struct super_block *sb,
struct exfat_chain *p_dir, int entry, unsigned int type); 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); int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir);
/* inode.c */ /* inode.c */
......
...@@ -154,6 +154,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size) ...@@ -154,6 +154,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
struct timespec64 ts; struct timespec64 ts;
struct exfat_dentry *ep, *ep2; struct exfat_dentry *ep, *ep2;
struct exfat_entry_set_cache *es; struct exfat_entry_set_cache *es;
int err;
es = exfat_get_dentry_set(sb, &(ei->dir), ei->entry, es = exfat_get_dentry_set(sb, &(ei->dir), ei->entry,
ES_ALL_ENTRIES); ES_ALL_ENTRIES);
...@@ -188,7 +189,9 @@ int __exfat_truncate(struct inode *inode, loff_t new_size) ...@@ -188,7 +189,9 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
} }
exfat_update_dir_chksum_with_entry_set(es); 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 */ /* cut off from the FAT chain */
......
...@@ -77,8 +77,7 @@ static int __exfat_write_inode(struct inode *inode, int sync) ...@@ -77,8 +77,7 @@ static int __exfat_write_inode(struct inode *inode, int sync)
ep2->dentry.stream.size = ep2->dentry.stream.valid_size; ep2->dentry.stream.size = ep2->dentry.stream.valid_size;
exfat_update_dir_chksum_with_entry_set(es); exfat_update_dir_chksum_with_entry_set(es);
exfat_free_dentry_set(es, sync); return exfat_free_dentry_set(es, sync);
return 0;
} }
int exfat_write_inode(struct inode *inode, struct writeback_control *wbc) 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, ...@@ -222,6 +221,7 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,
if (ei->dir.dir != DIR_DELETED && modified) { if (ei->dir.dir != DIR_DELETED && modified) {
struct exfat_dentry *ep; struct exfat_dentry *ep;
struct exfat_entry_set_cache *es; struct exfat_entry_set_cache *es;
int err;
es = exfat_get_dentry_set(sb, &(ei->dir), ei->entry, es = exfat_get_dentry_set(sb, &(ei->dir), ei->entry,
ES_ALL_ENTRIES); ES_ALL_ENTRIES);
...@@ -240,8 +240,9 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset, ...@@ -240,8 +240,9 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,
ep->dentry.stream.valid_size; ep->dentry.stream.valid_size;
exfat_update_dir_chksum_with_entry_set(es); 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 */ } /* end of if != DIR_DELETED */
inode->i_blocks += inode->i_blocks +=
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment