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

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

fs/exfat/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -460,7 +460,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
Original line number Diff line number Diff line
@@ -154,6 +154,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);
@@ -188,7 +189,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 −4
Original line number Diff line number Diff line
@@ -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,8 +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 */



		inode->i_blocks +=