Commit 68bf6bfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ext4 updates from Ted Ts'o:
 "Ext4 bug fixes and cleanups, plus some additional kunit tests"

* tag 'ext4_for_linus-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (23 commits)
  ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test
  ext4: hold group lock in ext4 kunit test
  ext4: alloc test super block from sget
  ext4: kunit: use dynamic inode allocation
  ext4: enable meta_bg only when new desc blocks are needed
  ext4: remove unused parameter biop in ext4_issue_discard()
  ext4: remove SLAB_MEM_SPREAD flag usage
  ext4: verify s_clusters_per_group even without bigalloc
  ext4: fix corruption during on-line resize
  ext4: don't report EOPNOTSUPP errors from discard
  ext4: drop duplicate ea_inode handling in ext4_xattr_block_set()
  ext4: fold quota accounting into ext4_xattr_inode_lookup_create()
  ext4: correct best extent lstart adjustment logic
  ext4: forbid commit inconsistent quota data when errors=remount-ro
  ext4: add a hint for block bitmap corrupt state in mb_groups
  ext4: fix the comment of ext4_map_blocks()/ext4_ext_map_blocks()
  ext4: improve error msg for ext4_mb_seq_groups_show
  ext4: remove unused buddy_loaded in ext4_mb_seq_groups_show
  ext4: Add unit test for ext4_mb_mark_diskspace_used
  ext4: Add unit test for mb_free_blocks
  ...
parents 32a50540 0ecae541

fs/ext4/extents.c

+3 −3
Original line number Diff line number Diff line
@@ -4111,10 +4111,10 @@ static ext4_lblk_t ext4_ext_determine_insert_hole(struct inode *inode, 
 *

 * Need to be called with

 * down_read(&EXT4_I(inode)->i_data_sem) if not allocating file system block

 * (ie, create is zero). Otherwise down_write(&EXT4_I(inode)->i_data_sem)

 * (ie, flags is zero). Otherwise down_write(&EXT4_I(inode)->i_data_sem)

 *

 * return > 0, number of blocks already mapped/allocated

 *          if create == 0 and these are pre-allocated blocks

 *          if flags doesn't contain EXT4_GET_BLOCKS_CREATE and these are pre-allocated blocks

 *          	buffer head is unmapped

 *          otherwise blocks are mapped

 *
@@ -4218,7 +4218,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 


	/*

	 * requested block isn't allocated yet;

	 * we couldn't try to create block if create flag is zero

	 * we couldn't try to create block if flags doesn't contain EXT4_GET_BLOCKS_CREATE

	 */

	if ((flags & EXT4_GET_BLOCKS_CREATE) == 0) {

		ext4_lblk_t len;

fs/ext4/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -465,9 +465,10 @@ static void ext4_map_blocks_es_recheck(handle_t *handle, 
 * Otherwise, call with ext4_ind_map_blocks() to handle indirect mapping

 * based files

 *

 * On success, it returns the number of blocks being mapped or allocated.  if

 * create==0 and the blocks are pre-allocated and unwritten, the resulting @map

 * is marked as unwritten. If the create == 1, it will mark @map as mapped.

 * On success, it returns the number of blocks being mapped or allocated.

 * If flags doesn't contain EXT4_GET_BLOCKS_CREATE the blocks are

 * pre-allocated and unwritten, the resulting @map is marked as unwritten.

 * If the flags contain EXT4_GET_BLOCKS_CREATE, it will mark @map as mapped.

 *

 * It returns 0 if plain look up failed (blocks have not been allocated), in

 * that case, @map is returned as unmapped but we still do fill map->m_len to
@@ -589,8 +590,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 
	 * Returns if the blocks have already allocated

	 *

	 * Note that if blocks have been preallocated

	 * ext4_ext_get_block() returns the create = 0

	 * with buffer head unmapped.

	 * ext4_ext_map_blocks() returns with buffer head unmapped

	 */

	if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED)

		/*

fs/ext4/mballoc-test.c

+584 −17

File changed.

Preview size limit exceeded, changes collapsed.

fs/ext4/mballoc.c

+35 −27

File changed.

Preview size limit exceeded, changes collapsed.

fs/ext4/resize.c

+3 −2
Original line number Diff line number Diff line
@@ -1602,7 +1602,8 @@ static int ext4_flex_group_add(struct super_block *sb, 
		int gdb_num = group / EXT4_DESC_PER_BLOCK(sb);

		int gdb_num_end = ((group + flex_gd->count - 1) /

				   EXT4_DESC_PER_BLOCK(sb));

		int meta_bg = ext4_has_feature_meta_bg(sb);

		int meta_bg = ext4_has_feature_meta_bg(sb) &&

			      gdb_num >= le32_to_cpu(es->s_first_meta_bg);

		sector_t padding_blocks = meta_bg ? 0 : sbi->s_sbh->b_blocknr -

					 ext4_group_first_block_no(sb, 0);
@@ -2084,7 +2085,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count) 
		}

	}



	if ((!resize_inode && !meta_bg) || n_blocks_count == o_blocks_count) {

	if ((!resize_inode && !meta_bg && n_desc_blocks > o_desc_blocks) || n_blocks_count == o_blocks_count) {

		err = ext4_convert_meta_bg(sb, resize_inode);

		if (err)

			goto out;