Skip to content

Commit fe35bf2

Browse files
committed
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
2 parents f5fcbc8 + f192579 commit fe35bf2

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

fs/exfat/dir.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ static void exfat_set_entry_type(struct exfat_dentry *ep, unsigned int type)
420420
static void exfat_init_stream_entry(struct exfat_dentry *ep,
421421
unsigned int start_clu, unsigned long long size)
422422
{
423+
memset(ep, 0, sizeof(*ep));
423424
exfat_set_entry_type(ep, TYPE_STREAM);
424425
if (size == 0)
425426
ep->dentry.stream.flags = ALLOC_FAT_CHAIN;
@@ -457,6 +458,7 @@ void exfat_init_dir_entry(struct exfat_entry_set_cache *es,
457458
struct exfat_dentry *ep;
458459

459460
ep = exfat_get_dentry_cached(es, ES_IDX_FILE);
461+
memset(ep, 0, sizeof(*ep));
460462
exfat_set_entry_type(ep, type);
461463
exfat_set_entry_time(sbi, ts,
462464
&ep->dentry.file.create_tz,

fs/exfat/file.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static int exfat_cont_expand(struct inode *inode, loff_t size)
5151
clu.flags = ei->flags;
5252

5353
ret = exfat_alloc_cluster(inode, new_num_clusters - num_clusters,
54-
&clu, IS_DIRSYNC(inode));
54+
&clu, inode_needs_sync(inode));
5555
if (ret)
5656
return ret;
5757

@@ -77,12 +77,11 @@ static int exfat_cont_expand(struct inode *inode, loff_t size)
7777
ei->i_size_aligned = round_up(size, sb->s_blocksize);
7878
ei->i_size_ondisk = ei->i_size_aligned;
7979
inode->i_blocks = round_up(size, sbi->cluster_size) >> 9;
80+
mark_inode_dirty(inode);
8081

81-
if (IS_DIRSYNC(inode))
82+
if (IS_SYNC(inode))
8283
return write_inode_now(inode, 1);
8384

84-
mark_inode_dirty(inode);
85-
8685
return 0;
8786

8887
free_clu:

0 commit comments

Comments
 (0)