Commit 2c7f8937 authored by Tetsuhiro Kohada's avatar Tetsuhiro Kohada Committed by Namjae Jeon
Browse files

exfat: remove EXFAT_SB_DIRTY flag 



This flag is set/reset in exfat_put_super()/exfat_sync_fs()
to avoid sync_blockdev().
- exfat_put_super():
Before calling this, the VFS has already called sync_filesystem(),
so sync is never performed here.
- exfat_sync_fs():
After calling this, the VFS calls sync_blockdev(), so, it is meaningless
to check EXFAT_SB_DIRTY or to bypass sync_blockdev() here.

Remove the EXFAT_SB_DIRTY check to ensure synchronization.
And remove the code related to the flag.

Signed-off-by: default avatarTetsuhiro Kohada <kohada.t2@gmail.com>
Reviewed-by: default avatarSungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
parent bcf87687

fs/exfat/balloc.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int exfat_set_bitmap(struct inode *inode, unsigned int clu) 
	b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);



	set_bit_le(b, sbi->vol_amap[i]->b_data);

	exfat_update_bh(sb, sbi->vol_amap[i], IS_DIRSYNC(inode));

	exfat_update_bh(sbi->vol_amap[i], IS_DIRSYNC(inode));

	return 0;

}
@@ -180,7 +180,7 @@ void exfat_clear_bitmap(struct inode *inode, unsigned int clu) 
	b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);



	clear_bit_le(b, sbi->vol_amap[i]->b_data);

	exfat_update_bh(sb, sbi->vol_amap[i], IS_DIRSYNC(inode));

	exfat_update_bh(sbi->vol_amap[i], IS_DIRSYNC(inode));



	if (opts->discard) {

		int ret_discard;

fs/exfat/dir.c

+8 −8
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir, 
			&ep->dentry.file.access_date,

			NULL);



	exfat_update_bh(sb, bh, IS_DIRSYNC(inode));

	exfat_update_bh(bh, IS_DIRSYNC(inode));

	brelse(bh);



	ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, &sector);
@@ -480,7 +480,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir, 
	exfat_init_stream_entry(ep,

		(type == TYPE_FILE) ? ALLOC_FAT_CHAIN : ALLOC_NO_FAT_CHAIN,

		start_clu, size);

	exfat_update_bh(sb, bh, IS_DIRSYNC(inode));

	exfat_update_bh(bh, IS_DIRSYNC(inode));

	brelse(bh);



	return 0;
@@ -516,7 +516,7 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir, 
	}



	fep->dentry.file.checksum = cpu_to_le16(chksum);

	exfat_update_bh(sb, fbh, IS_DIRSYNC(inode));

	exfat_update_bh(fbh, IS_DIRSYNC(inode));

release_fbh:

	brelse(fbh);

	return ret;
@@ -538,7 +538,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir, 
		return -EIO;



	ep->dentry.file.num_ext = (unsigned char)(num_entries - 1);

	exfat_update_bh(sb, bh, sync);

	exfat_update_bh(bh, sync);

	brelse(bh);



	ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, &sector);
@@ -547,7 +547,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir, 


	ep->dentry.stream.name_len = p_uniname->name_len;

	ep->dentry.stream.name_hash = cpu_to_le16(p_uniname->name_hash);

	exfat_update_bh(sb, bh, sync);

	exfat_update_bh(bh, sync);

	brelse(bh);



	for (i = EXFAT_FIRST_CLUSTER; i < num_entries; i++) {
@@ -556,7 +556,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir, 
			return -EIO;



		exfat_init_name_entry(ep, uniname);

		exfat_update_bh(sb, bh, sync);

		exfat_update_bh(bh, sync);

		brelse(bh);

		uniname += EXFAT_FILE_NAME_LEN;

	}
@@ -580,7 +580,7 @@ int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir, 
			return -EIO;



		exfat_set_entry_type(ep, TYPE_DELETED);

		exfat_update_bh(sb, bh, IS_DIRSYNC(inode));

		exfat_update_bh(bh, IS_DIRSYNC(inode));

		brelse(bh);

	}
@@ -610,7 +610,7 @@ void exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync) 


	for (i = 0; i < es->num_bh; i++) {

		if (es->modified)

			exfat_update_bh(es->sb, es->bh[i], sync);

			exfat_update_bh(es->bh[i], sync);

		brelse(es->bh[i]);

	}

	kfree(es);

fs/exfat/exfat_fs.h

+1 −4
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
#define EXFAT_SUPER_MAGIC       0x2011BAB0UL

#define EXFAT_ROOT_INO		1



#define EXFAT_SB_DIRTY		0



#define EXFAT_CLUSTERS_UNTRACKED (~0u)



/*
@@ -238,7 +236,6 @@ struct exfat_sb_info { 
	unsigned int clu_srch_ptr; /* cluster search pointer */

	unsigned int used_clusters; /* number of used clusters */



	unsigned long s_state;

	struct mutex s_lock; /* superblock lock */

	struct exfat_mount_options options;

	struct nls_table *nls_io; /* Charset used for input and display */
@@ -515,7 +512,7 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts, 
		u8 *tz, __le16 *time, __le16 *date, u8 *time_cs);

u16 exfat_calc_chksum16(void *data, int len, u16 chksum, int type);

u32 exfat_calc_chksum32(void *data, int len, u32 chksum, int type);

void exfat_update_bh(struct super_block *sb, struct buffer_head *bh, int sync);

void exfat_update_bh(struct buffer_head *bh, int sync);

void exfat_chain_set(struct exfat_chain *ec, unsigned int dir,

		unsigned int size, unsigned char flags);

void exfat_chain_dup(struct exfat_chain *dup, struct exfat_chain *ec);

fs/exfat/fatent.c

+2 −5
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int exfat_ent_set(struct super_block *sb, unsigned int loc, 


	fat_entry = (__le32 *)&(bh->b_data[off]);

	*fat_entry = cpu_to_le32(content);

	exfat_update_bh(sb, bh, sb->s_flags & SB_SYNCHRONOUS);

	exfat_update_bh(bh, sb->s_flags & SB_SYNCHRONOUS);

	exfat_mirror_bh(sb, sec, bh);

	brelse(bh);

	return 0;
@@ -174,7 +174,6 @@ int exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain) 
		return -EIO;

	}



	set_bit(EXFAT_SB_DIRTY, &sbi->s_state);

	clu = p_chain->dir;



	if (p_chain->flags == ALLOC_NO_FAT_CHAIN) {
@@ -274,7 +273,7 @@ int exfat_zeroed_cluster(struct inode *dir, unsigned int clu) 
			goto release_bhs;

		}

		memset(bhs[n]->b_data, 0, sb->s_blocksize);

		exfat_update_bh(sb, bhs[n], 0);

		exfat_update_bh(bhs[n], 0);



		n++;

		blknr++;
@@ -358,8 +357,6 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 
		}

	}



	set_bit(EXFAT_SB_DIRTY, &sbi->s_state);



	p_chain->dir = EXFAT_EOF_CLUSTER;



	while ((new_clu = exfat_find_free_bitmap(sb, hint_clu)) !=

fs/exfat/misc.c

+1 −2
Original line number Diff line number Diff line
@@ -163,9 +163,8 @@ u32 exfat_calc_chksum32(void *data, int len, u32 chksum, int type) 
	return chksum;

}



void exfat_update_bh(struct super_block *sb, struct buffer_head *bh, int sync)

void exfat_update_bh(struct buffer_head *bh, int sync)

{

	set_bit(EXFAT_SB_DIRTY, &EXFAT_SB(sb)->s_state);

	set_buffer_uptodate(bh);

	mark_buffer_dirty(bh);

CRA Git | Maintained and supported by SUSTech CRA and CCSE