Commit 88db8458 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull exfat updates from Namjae Jeon:

 - Fix ->i_blocks truncation issue that still exists elsewhere.

 - Four cleanups & typos fixes.

 - Move super block magic number to magic.h

 - Fix missing REQ_SYNC in exfat_update_bhs().

* tag 'exfat-for-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
  exfat: fix missing REQ_SYNC in exfat_update_bhs()
  exfat: remove argument 'sector' from exfat_get_dentry()
  exfat: move super block magic number to magic.h
  exfat: fix i_blocks for files truncated over 4 GiB
  exfat: reuse exfat_inode_info variable instead of calling EXFAT_I()
  exfat: make exfat_find_location() static
  exfat: fix typos in comments
  exfat: simplify is_valid_cluster()
parents 175398a0 3d966521

fs/exfat/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int exfat_load_bitmap(struct super_block *sb) 
			struct exfat_dentry *ep;

			struct buffer_head *bh;



			ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);

			ep = exfat_get_dentry(sb, &clu, i, &bh);

			if (!ep)

				return -EIO;

fs/exfat/dir.c

+17 −25
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent 
{

	int i, dentries_per_clu, dentries_per_clu_bits = 0, num_ext;

	unsigned int type, clu_offset, max_dentries;

	sector_t sector;

	struct exfat_chain dir, clu;

	struct exfat_uni_name uni_name;

	struct exfat_dentry *ep;
@@ -115,7 +114,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent 
		i = dentry & (dentries_per_clu - 1);



		for ( ; i < dentries_per_clu; i++, dentry++) {

			ep = exfat_get_dentry(sb, &clu, i, &bh, &sector);

			ep = exfat_get_dentry(sb, &clu, i, &bh);

			if (!ep)

				return -EIO;
@@ -156,7 +155,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent 
				dir_entry->namebuf.lfnbuf_len);

			brelse(bh);



			ep = exfat_get_dentry(sb, &clu, i + 1, &bh, NULL);

			ep = exfat_get_dentry(sb, &clu, i + 1, &bh);

			if (!ep)

				return -EIO;

			dir_entry->size =
@@ -445,7 +444,6 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir, 
	struct super_block *sb = inode->i_sb;

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	struct timespec64 ts = current_time(inode);

	sector_t sector;

	struct exfat_dentry *ep;

	struct buffer_head *bh;
@@ -453,7 +451,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir, 
	 * We cannot use exfat_get_dentry_set here because file ep is not

	 * initialized yet.

	 */

	ep = exfat_get_dentry(sb, p_dir, entry, &bh, &sector);

	ep = exfat_get_dentry(sb, p_dir, entry, &bh);

	if (!ep)

		return -EIO;
@@ -477,7 +475,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir, 
	exfat_update_bh(bh, IS_DIRSYNC(inode));

	brelse(bh);



	ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, &sector);

	ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);

	if (!ep)

		return -EIO;
@@ -496,12 +494,11 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir, 
	struct super_block *sb = inode->i_sb;

	int ret = 0;

	int i, num_entries;

	sector_t sector;

	u16 chksum;

	struct exfat_dentry *ep, *fep;

	struct buffer_head *fbh, *bh;



	fep = exfat_get_dentry(sb, p_dir, entry, &fbh, &sector);

	fep = exfat_get_dentry(sb, p_dir, entry, &fbh);

	if (!fep)

		return -EIO;
@@ -509,7 +506,7 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir, 
	chksum = exfat_calc_chksum16(fep, DENTRY_SIZE, 0, CS_DIR_ENTRY);



	for (i = 1; i < num_entries; i++) {

		ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, NULL);

		ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);

		if (!ep) {

			ret = -EIO;

			goto release_fbh;
@@ -531,13 +528,12 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir, 
{

	struct super_block *sb = inode->i_sb;

	int i;

	sector_t sector;

	unsigned short *uniname = p_uniname->name;

	struct exfat_dentry *ep;

	struct buffer_head *bh;

	int sync = IS_DIRSYNC(inode);



	ep = exfat_get_dentry(sb, p_dir, entry, &bh, &sector);

	ep = exfat_get_dentry(sb, p_dir, entry, &bh);

	if (!ep)

		return -EIO;
@@ -545,7 +541,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir, 
	exfat_update_bh(bh, sync);

	brelse(bh);



	ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, &sector);

	ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);

	if (!ep)

		return -EIO;
@@ -555,7 +551,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir, 
	brelse(bh);



	for (i = EXFAT_FIRST_CLUSTER; i < num_entries; i++) {

		ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, &sector);

		ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);

		if (!ep)

			return -EIO;
@@ -574,12 +570,11 @@ int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir, 
{

	struct super_block *sb = inode->i_sb;

	int i;

	sector_t sector;

	struct exfat_dentry *ep;

	struct buffer_head *bh;



	for (i = order; i < num_entries; i++) {

		ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, &sector);

		ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);

		if (!ep)

			return -EIO;
@@ -656,7 +651,7 @@ static int exfat_walk_fat_chain(struct super_block *sb, 
	return 0;

}



int exfat_find_location(struct super_block *sb, struct exfat_chain *p_dir,

static int exfat_find_location(struct super_block *sb, struct exfat_chain *p_dir,

			       int entry, sector_t *sector, int *offset)

{

	int ret;
@@ -717,8 +712,7 @@ static int exfat_dir_readahead(struct super_block *sb, sector_t sec) 
}



struct exfat_dentry *exfat_get_dentry(struct super_block *sb,

		struct exfat_chain *p_dir, int entry, struct buffer_head **bh,

		sector_t *sector)

		struct exfat_chain *p_dir, int entry, struct buffer_head **bh)

{

	unsigned int dentries_per_page = EXFAT_B_TO_DEN(PAGE_SIZE);

	int off;
@@ -740,8 +734,6 @@ struct exfat_dentry *exfat_get_dentry(struct super_block *sb, 
	if (!*bh)

		return NULL;



	if (sector)

		*sector = sec;

	return (struct exfat_dentry *)((*bh)->b_data + off);

}
@@ -892,7 +884,7 @@ struct exfat_entry_set_cache *exfat_get_dentry_set(struct super_block *sb, 
		es->bh[es->num_bh++] = bh;

	}



	/* validiate cached dentries */

	/* validate cached dentries */

	for (i = 1; i < num_entries; i++) {

		ep = exfat_get_dentry_cached(es, i);

		if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode))
@@ -960,7 +952,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, 
			if (rewind && dentry == end_eidx)

				goto not_found;



			ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);

			ep = exfat_get_dentry(sb, &clu, i, &bh);

			if (!ep)

				return -EIO;
@@ -1145,7 +1137,7 @@ int exfat_count_ext_entries(struct super_block *sb, struct exfat_chain *p_dir, 
	struct buffer_head *bh;



	for (i = 0, entry++; i < ep->dentry.file.num_ext; i++, entry++) {

		ext_ep = exfat_get_dentry(sb, p_dir, entry, &bh, NULL);

		ext_ep = exfat_get_dentry(sb, p_dir, entry, &bh);

		if (!ext_ep)

			return -EIO;
@@ -1175,7 +1167,7 @@ int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir) 


	while (clu.dir != EXFAT_EOF_CLUSTER) {

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

			ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);

			ep = exfat_get_dentry(sb, &clu, i, &bh);

			if (!ep)

				return -EIO;

			entry_type = exfat_get_entry_type(ep);

fs/exfat/exfat_fs.h

+1 −5
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/ratelimit.h>

#include <linux/nls.h>



#define EXFAT_SUPER_MAGIC       0x2011BAB0UL

#define EXFAT_ROOT_INO		1



#define EXFAT_CLUSTERS_UNTRACKED (~0u)
@@ -459,11 +458,8 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, 
		struct exfat_chain *p_dir, struct exfat_uni_name *p_uniname,

		int num_entries, unsigned int type, struct exfat_hint *hint_opt);

int exfat_alloc_new_dir(struct inode *inode, struct exfat_chain *clu);

int exfat_find_location(struct super_block *sb, struct exfat_chain *p_dir,

		int entry, sector_t *sector, int *offset);

struct exfat_dentry *exfat_get_dentry(struct super_block *sb,

		struct exfat_chain *p_dir, int entry, struct buffer_head **bh,

		sector_t *sector);

		struct exfat_chain *p_dir, int entry, struct buffer_head **bh);

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,

fs/exfat/fatent.c

+1 −3
Original line number Diff line number Diff line
@@ -84,9 +84,7 @@ int exfat_ent_set(struct super_block *sb, unsigned int loc, 
static inline bool is_valid_cluster(struct exfat_sb_info *sbi,

		unsigned int clus)

{

	if (clus < EXFAT_FIRST_CLUSTER || sbi->num_clusters <= clus)

		return false;

	return true;

	return clus >= EXFAT_FIRST_CLUSTER && clus < sbi->num_clusters;

}



int exfat_ent_get(struct super_block *sb, unsigned int loc,

fs/exfat/file.c

+9 −9
Original line number Diff line number Diff line
@@ -110,8 +110,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size) 
	exfat_set_volume_dirty(sb);



	num_clusters_new = EXFAT_B_TO_CLU_ROUND_UP(i_size_read(inode), sbi);

	num_clusters_phys =

		EXFAT_B_TO_CLU_ROUND_UP(EXFAT_I(inode)->i_size_ondisk, sbi);

	num_clusters_phys = EXFAT_B_TO_CLU_ROUND_UP(ei->i_size_ondisk, sbi);



	exfat_chain_set(&clu, ei->start_clu, num_clusters_phys, ei->flags);
@@ -228,12 +227,13 @@ void exfat_truncate(struct inode *inode, loff_t size) 
{

	struct super_block *sb = inode->i_sb;

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	struct exfat_inode_info *ei = EXFAT_I(inode);

	unsigned int blocksize = i_blocksize(inode);

	loff_t aligned_size;

	int err;



	mutex_lock(&sbi->s_lock);

	if (EXFAT_I(inode)->start_clu == 0) {

	if (ei->start_clu == 0) {

		/*

		 * Empty start_clu != ~0 (not allocated)

		 */
@@ -251,8 +251,8 @@ void exfat_truncate(struct inode *inode, loff_t size) 
	else

		mark_inode_dirty(inode);



	inode->i_blocks = ((i_size_read(inode) + (sbi->cluster_size - 1)) &

			~(sbi->cluster_size - 1)) >> inode->i_blkbits;

	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>

				inode->i_blkbits;

write_size:

	aligned_size = i_size_read(inode);

	if (aligned_size & (blocksize - 1)) {
@@ -260,11 +260,11 @@ void exfat_truncate(struct inode *inode, loff_t size) 
		aligned_size++;

	}



	if (EXFAT_I(inode)->i_size_ondisk > i_size_read(inode))

		EXFAT_I(inode)->i_size_ondisk = aligned_size;

	if (ei->i_size_ondisk > i_size_read(inode))

		ei->i_size_ondisk = aligned_size;



	if (EXFAT_I(inode)->i_size_aligned > i_size_read(inode))

		EXFAT_I(inode)->i_size_aligned = aligned_size;

	if (ei->i_size_aligned > i_size_read(inode))

		ei->i_size_aligned = aligned_size;

	mutex_unlock(&sbi->s_lock);

}