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

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

Pull exfat updates from Namjae Jeon:

 - don't clear MediaFailure and VolumeDirty bit in volume flags if these
   were already set before mounting

 - write multiple dirty buffers at once in sync mode

 - remove unneeded EXFAT_SB_DIRTY bit set

* tag 'exfat-for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
  exfat: retain 'VolumeFlags' properly
  exfat: optimize exfat_zeroed_cluster()
  exfat: add error check when updating dir-entries
  exfat: write multiple sectors at once
  exfat: remove EXFAT_SB_DIRTY flag
parents 9f457179 7018ec68

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

+18 −14
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);

	}
@@ -604,16 +604,20 @@ 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;

	int i, err = 0;



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

	if (es->modified)

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

		err = exfat_update_bhs(es->bh, es->num_bh, sync);



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

		if (err)

			bforget(es->bh[i]);

		else

			brelse(es->bh[i]);

	}

	kfree(es);

	return err;

}



static int exfat_walk_fat_chain(struct super_block *sb,

fs/exfat/exfat_fs.h

+7 −7
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)



/*
@@ -226,7 +224,8 @@ struct exfat_sb_info { 
	unsigned int num_FAT_sectors; /* num of FAT sectors */

	unsigned int root_dir; /* root dir cluster */

	unsigned int dentries_per_clu; /* num of dentries per cluster */

	unsigned int vol_flag; /* volume dirty flag */

	unsigned int vol_flags; /* volume flags */

	unsigned int vol_flags_persistent; /* volume flags to retain */

	struct buffer_head *boot_bh; /* buffer_head of BOOT sector */



	unsigned int map_clu; /* allocation bitmap start cluster */
@@ -238,7 +237,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 */
@@ -383,7 +381,8 @@ static inline int exfat_sector_to_cluster(struct exfat_sb_info *sbi, 
}



/* super.c */

int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag);

int exfat_set_volume_dirty(struct super_block *sb);

int exfat_clear_volume_dirty(struct super_block *sb);



/* fatent.c */

#define exfat_get_next_cluster(sb, pclu) exfat_ent_get(sb, *(pclu), pclu)
@@ -463,7 +462,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 */
@@ -515,7 +514,8 @@ 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);

int exfat_update_bhs(struct buffer_head **bhs, int nr_bhs, 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/exfat_raw.h

+2 −3
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ 


#define EXFAT_MAX_FILE_LEN	255



#define VOL_CLEAN		0x0000

#define VOL_DIRTY		0x0002

#define ERR_MEDIUM		0x0004

#define VOLUME_DIRTY		0x0002

#define MEDIA_FAILURE		0x0004



#define EXFAT_EOF_CLUSTER	0xFFFFFFFFu

#define EXFAT_BAD_CLUSTER	0xFFFFFFF7u

fs/exfat/fatent.c

+11 −47
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) {
@@ -230,21 +229,6 @@ int exfat_find_last_cluster(struct super_block *sb, struct exfat_chain *p_chain, 
	return 0;

}



static inline int exfat_sync_bhs(struct buffer_head **bhs, int nr_bhs)

{

	int i, err = 0;



	for (i = 0; i < nr_bhs; i++)

		write_dirty_buffer(bhs[i], 0);



	for (i = 0; i < nr_bhs; i++) {

		wait_on_buffer(bhs[i]);

		if (!err && !buffer_uptodate(bhs[i]))

			err = -EIO;

	}

	return err;

}



int exfat_zeroed_cluster(struct inode *dir, unsigned int clu)

{

	struct super_block *sb = dir->i_sb;
@@ -266,41 +250,23 @@ int exfat_zeroed_cluster(struct inode *dir, unsigned int clu) 
	}



	/* Zeroing the unused blocks on this cluster */

	n = 0;

	while (blknr < last_blknr) {

		for (n = 0; n < nr_bhs && blknr < last_blknr; n++, blknr++) {

			bhs[n] = sb_getblk(sb, blknr);

			if (!bhs[n]) {

				err = -ENOMEM;

				goto release_bhs;

			}

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

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



		n++;

		blknr++;



		if (n == nr_bhs) {

			if (IS_DIRSYNC(dir)) {

				err = exfat_sync_bhs(bhs, n);

				if (err)

					goto release_bhs;

			}



			for (i = 0; i < n; i++)

				brelse(bhs[i]);

			n = 0;

		}

		}



	if (IS_DIRSYNC(dir)) {

		err = exfat_sync_bhs(bhs, n);

		err = exfat_update_bhs(bhs, n, IS_DIRSYNC(dir));

		if (err)

			goto release_bhs;

	}



		for (i = 0; i < n; i++)

			brelse(bhs[i]);



	}

	return 0;



release_bhs:
@@ -358,8 +324,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)) !=

CRA Git | Maintained and supported by SUSTech CRA and CCSE