Commit 074e461d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus-6.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 fixes from Ted Ts'o:

 - Fix fast commit checks for file systems with ea_inode enabled

 - Don't drop the i_version mount option on a remount

 - Fix FIEMAP reporting when there are holes in a bigalloc file system

 - Don't fail when mounting read-only when there are inodes in the
   orphan file

 - Fix hole length overflow for indirect mapped files on file systems
   with an 8k or 16k block file system

* tag 'ext4_for_linus-6.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd2: prevent softlockup in jbd2_log_do_checkpoint()
  ext4: fix incorrect function name in comment
  ext4: use kmalloc_array() for array space allocation
  ext4: fix hole length calculation overflow in non-extent inodes
  ext4: don't try to clear the orphan_present feature block device is r/o
  ext4: fix reserved gdt blocks handling in fsmap
  ext4: fix fsmap end of range reporting with bigalloc
  ext4: remove redundant __GFP_NOWARN
  ext4: fix unused variable warning in ext4_init_new_dir
  ext4: remove useless if check
  ext4: check fast symlink for ea_inode correctly
  ext4: preserve SB_I_VERSION on remount
  ext4: show the default enabled i_version option
parents c17b750b 9d98cf46

fs/ext4/fsmap.c

+20 −3
Original line number Diff line number Diff line
@@ -393,6 +393,14 @@ static unsigned int ext4_getfsmap_find_sb(struct super_block *sb, 
	/* Reserved GDT blocks */

	if (!ext4_has_feature_meta_bg(sb) || metagroup < first_meta_bg) {

		len = le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks);



		/*

		 * mkfs.ext4 can set s_reserved_gdt_blocks as 0 in some cases,

		 * check for that.

		 */

		if (!len)

			return 0;



		error = ext4_getfsmap_fill(meta_list, fsb, len,

					   EXT4_FMR_OWN_RESV_GDT);

		if (error)
@@ -526,6 +534,7 @@ static int ext4_getfsmap_datadev(struct super_block *sb, 
	ext4_group_t end_ag;

	ext4_grpblk_t first_cluster;

	ext4_grpblk_t last_cluster;

	struct ext4_fsmap irec;

	int error = 0;



	bofs = le32_to_cpu(sbi->s_es->s_first_data_block);
@@ -609,10 +618,18 @@ static int ext4_getfsmap_datadev(struct super_block *sb, 
			goto err;

	}



	/* Report any gaps at the end of the bg */

	/*

	 * The dummy record below will cause ext4_getfsmap_helper() to report

	 * any allocated blocks at the end of the range.

	 */

	irec.fmr_device = 0;

	irec.fmr_physical = end_fsb + 1;

	irec.fmr_length = 0;

	irec.fmr_owner = EXT4_FMR_OWN_FREE;

	irec.fmr_flags = 0;



	info->gfi_last = true;

	error = ext4_getfsmap_datadev_helper(sb, end_ag, last_cluster + 1,

					     0, info);

	error = ext4_getfsmap_helper(sb, info, &irec);

	if (error)

		goto err;

fs/ext4/indirect.c

+2 −2
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode, 
	int indirect_blks;

	int blocks_to_boundary = 0;

	int depth;

	int count = 0;

	u64 count = 0;

	ext4_fsblk_t first_block = 0;



	trace_ext4_ind_map_blocks_enter(inode, map->m_lblk, map->m_len, flags);
@@ -588,7 +588,7 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode, 
		count++;

		/* Fill in size of a hole we found */

		map->m_pblk = 0;

		map->m_len = min_t(unsigned int, map->m_len, count);

		map->m_len = umin(map->m_len, count);

		goto cleanup;

	}

fs/ext4/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static inline int ext4_begin_ordered_truncate(struct inode *inode, 
 */

int ext4_inode_is_fast_symlink(struct inode *inode)

{

	if (!(EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL)) {

	if (!ext4_has_feature_ea_inode(inode->i_sb)) {

		int ea_blocks = EXT4_I(inode)->i_file_acl ?

				EXT4_CLUSTER_SIZE(inode->i_sb) >> 9 : 0;
@@ -3155,7 +3155,7 @@ static int ext4_da_write_begin(const struct kiocb *iocb, 
		folio_unlock(folio);

		folio_put(folio);

		/*

		 * block_write_begin may have instantiated a few blocks

		 * ext4_block_write_begin may have instantiated a few blocks

		 * outside i_size.  Trim these off again. Don't need

		 * i_size_read because we hold inode lock.

		 */

fs/ext4/namei.c

+0 −4
Original line number Diff line number Diff line
@@ -2965,7 +2965,6 @@ int ext4_init_new_dir(handle_t *handle, struct inode *dir, 
			     struct inode *inode)

{

	struct buffer_head *dir_block = NULL;

	struct ext4_dir_entry_2 *de;

	ext4_lblk_t block = 0;

	int err;
@@ -2982,10 +2981,7 @@ int ext4_init_new_dir(handle_t *handle, struct inode *dir, 
	dir_block = ext4_append(handle, inode, &block);

	if (IS_ERR(dir_block))

		return PTR_ERR(dir_block);

	de = (struct ext4_dir_entry_2 *)dir_block->b_data;

	err = ext4_init_dirblock(handle, inode, dir_block, dir->i_ino, NULL, 0);

	if (err)

		goto out;

out:

	brelse(dir_block);

	return err;

fs/ext4/orphan.c

+3 −2
Original line number Diff line number Diff line
@@ -589,7 +589,8 @@ int ext4_init_orphan_info(struct super_block *sb) 
	}

	oi->of_blocks = inode->i_size >> sb->s_blocksize_bits;

	oi->of_csum_seed = EXT4_I(inode)->i_csum_seed;

	oi->of_binfo = kmalloc(oi->of_blocks*sizeof(struct ext4_orphan_block),

	oi->of_binfo = kmalloc_array(oi->of_blocks,

				     sizeof(struct ext4_orphan_block),

				     GFP_KERNEL);

	if (!oi->of_binfo) {

		ret = -ENOMEM;