Commit fe35bf27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'exfat-for-6.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat 

Pull exfat fixes from Namjae Jeon:

 - Fix xfstests generic/013 test failure with dirsync mount option

 - Initialize the reserved fields of deleted file and stream extension
   dentries to zero

* tag 'exfat-for-6.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
  exfat: zero the reserved fields of file and stream extension dentries
  exfat: fix timing of synchronizing bitmap and inode
parents f5fcbc8b f1925799

fs/exfat/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ static void exfat_set_entry_type(struct exfat_dentry *ep, unsigned int type) 
static void exfat_init_stream_entry(struct exfat_dentry *ep,

		unsigned int start_clu, unsigned long long size)

{

	memset(ep, 0, sizeof(*ep));

	exfat_set_entry_type(ep, TYPE_STREAM);

	if (size == 0)

		ep->dentry.stream.flags = ALLOC_FAT_CHAIN;
@@ -457,6 +458,7 @@ void exfat_init_dir_entry(struct exfat_entry_set_cache *es, 
	struct exfat_dentry *ep;



	ep = exfat_get_dentry_cached(es, ES_IDX_FILE);

	memset(ep, 0, sizeof(*ep));

	exfat_set_entry_type(ep, type);

	exfat_set_entry_time(sbi, ts,

			&ep->dentry.file.create_tz,

fs/exfat/file.c

+3 −4
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int exfat_cont_expand(struct inode *inode, loff_t size) 
	clu.flags = ei->flags;



	ret = exfat_alloc_cluster(inode, new_num_clusters - num_clusters,

			&clu, IS_DIRSYNC(inode));

			&clu, inode_needs_sync(inode));

	if (ret)

		return ret;
@@ -77,12 +77,11 @@ static int exfat_cont_expand(struct inode *inode, loff_t size) 
	ei->i_size_aligned = round_up(size, sb->s_blocksize);

	ei->i_size_ondisk = ei->i_size_aligned;

	inode->i_blocks = round_up(size, sbi->cluster_size) >> 9;

	mark_inode_dirty(inode);



	if (IS_DIRSYNC(inode))

	if (IS_SYNC(inode))

		return write_inode_now(inode, 1);



	mark_inode_dirty(inode);



	return 0;



free_clu: