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

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

Pull exfat updates from Namjae Jeon:

 - Fix xfstests generic/482 test failure

 - Fix double free in delayed_free

* tag 'exfat-for-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
  exfat: do not clear volume dirty flag during sync
  exfat: fix double free in delayed_free
parents a56baa22 46a55769

fs/exfat/nls.c

+1 −0
Original line number Diff line number Diff line
@@ -801,4 +801,5 @@ int exfat_create_upcase_table(struct super_block *sb) 
void exfat_free_upcase_table(struct exfat_sb_info *sbi)

{

	kvfree(sbi->vol_utbl);

	sbi->vol_utbl = NULL;

}

fs/exfat/super.c

+7 −23
Original line number Diff line number Diff line
@@ -36,31 +36,12 @@ static void exfat_put_super(struct super_block *sb) 
	struct exfat_sb_info *sbi = EXFAT_SB(sb);



	mutex_lock(&sbi->s_lock);

	exfat_clear_volume_dirty(sb);

	exfat_free_bitmap(sbi);

	brelse(sbi->boot_bh);

	mutex_unlock(&sbi->s_lock);

}



static int exfat_sync_fs(struct super_block *sb, int wait)

{

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	int err = 0;



	if (unlikely(exfat_forced_shutdown(sb)))

		return 0;



	if (!wait)

		return 0;



	/* If there are some dirty buffers in the bdev inode */

	mutex_lock(&sbi->s_lock);

	sync_blockdev(sb->s_bdev);

	if (exfat_clear_volume_dirty(sb))

		err = -EIO;

	mutex_unlock(&sbi->s_lock);

	return err;

}



static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf)

{

	struct super_block *sb = dentry->d_sb;
@@ -219,7 +200,6 @@ static const struct super_operations exfat_sops = { 
	.write_inode	= exfat_write_inode,

	.evict_inode	= exfat_evict_inode,

	.put_super	= exfat_put_super,

	.sync_fs	= exfat_sync_fs,

	.statfs		= exfat_statfs,

	.show_options	= exfat_show_options,

	.shutdown	= exfat_shutdown,
@@ -751,10 +731,14 @@ static void exfat_free(struct fs_context *fc) 


static int exfat_reconfigure(struct fs_context *fc)

{

	struct super_block *sb = fc->root->d_sb;

	fc->sb_flags |= SB_NODIRATIME;



	/* volume flag will be updated in exfat_sync_fs */

	sync_filesystem(fc->root->d_sb);

	sync_filesystem(sb);

	mutex_lock(&EXFAT_SB(sb)->s_lock);

	exfat_clear_volume_dirty(sb);

	mutex_unlock(&EXFAT_SB(sb)->s_lock);



	return 0;

}