Commit 7991c92f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ext4 updates from Ted Ts'o:

 - more folio conversion patches

 - add support for FS_IOC_GETFSSYSFSPATH

 - mballoc cleaups and add more kunit tests

 - sysfs cleanups and bug fixes

 - miscellaneous bug fixes and cleanups

* tag 'ext4_for_linus-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)
  ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp()
  jbd2: add prefix 'jbd2' for 'shrink_type'
  jbd2: use shrink_type type instead of bool type for __jbd2_journal_clean_checkpoint_list()
  ext4: fix uninitialized ratelimit_state->lock access in __ext4_fill_super()
  ext4: remove calls to to set/clear the folio error flag
  ext4: propagate errors from ext4_sb_bread() in ext4_xattr_block_cache_find()
  ext4: fix mb_cache_entry's e_refcnt leak in ext4_xattr_block_cache_find()
  jbd2: remove redundant assignement to variable err
  ext4: remove the redundant folio_wait_stable()
  ext4: fix potential unnitialized variable
  ext4: convert ac_buddy_page to ac_buddy_folio
  ext4: convert ac_bitmap_page to ac_bitmap_folio
  ext4: convert ext4_mb_init_cache() to take a folio
  ext4: convert bd_buddy_page to bd_buddy_folio
  ext4: convert bd_bitmap_page to bd_bitmap_folio
  ext4: open coding repeated check in next_linear_group
  ext4: use correct criteria name instead stale integer number in comment
  ext4: call ext4_mb_mark_free_simple to free continuous bits in found chunk
  ext4: add test_mb_mark_used_cost to estimate cost of mb_mark_used
  ext4: keep "prefetch_grp" and "nr" consistent
  ...
parents 61ea647e c6a6c969

fs/ext4/acl.h

+0 −5
Original line number Diff line number Diff line
@@ -68,11 +68,6 @@ extern int ext4_init_acl(handle_t *, struct inode *, struct inode *); 
static inline int

ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)

{

	/* usually, the umask is applied by posix_acl_create(), but if

	   ext4 ACL support is disabled at compile time, we need to do

	   it here, because posix_acl_create() will never be called */

	inode->i_mode &= ~current_umask();



	return 0;

}

#endif  /* CONFIG_EXT4_FS_POSIX_ACL */

fs/ext4/ext4.h

+6 −3
Original line number Diff line number Diff line
@@ -213,11 +213,14 @@ enum criteria { 
#define EXT4_MB_USE_RESERVED		0x2000

/* Do strict check for free blocks while retrying block allocation */

#define EXT4_MB_STRICT_CHECK		0x4000

/* Large fragment size list lookup succeeded at least once for cr = 0 */

/* Large fragment size list lookup succeeded at least once for

 * CR_POWER2_ALIGNED */

#define EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED		0x8000

/* Avg fragment size rb tree lookup succeeded at least once for cr = 1 */

/* Avg fragment size rb tree lookup succeeded at least once for

 * CR_GOAL_LEN_FAST */

#define EXT4_MB_CR_GOAL_LEN_FAST_OPTIMIZED		0x00010000

/* Avg fragment size rb tree lookup succeeded at least once for cr = 1.5 */

/* Avg fragment size rb tree lookup succeeded at least once for

 * CR_BEST_AVAIL_LEN */

#define EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED		0x00020000



struct ext4_allocation_request {

fs/ext4/extents.c

+2 −1
Original line number Diff line number Diff line
@@ -3402,9 +3402,10 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, 
	struct ext4_extent *ex, *abut_ex;

	ext4_lblk_t ee_block, eof_block;

	unsigned int ee_len, depth, map_len = map->m_len;

	int allocated = 0, max_zeroout = 0;

	int err = 0;

	int split_flag = EXT4_EXT_DATA_VALID2;

	int allocated = 0;

	unsigned int max_zeroout = 0;



	ext_debug(inode, "logical block %llu, max_blocks %u\n",

		  (unsigned long long)map->m_lblk, map_len);

fs/ext4/file.c

+2 −3
Original line number Diff line number Diff line
@@ -844,8 +844,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, 
	if (err)

		goto out_journal;

	lock_buffer(sbi->s_sbh);

	strncpy(sbi->s_es->s_last_mounted, cp,

		sizeof(sbi->s_es->s_last_mounted));

	strtomem_pad(sbi->s_es->s_last_mounted, cp, 0);

	ext4_superblock_csum_set(sb);

	unlock_buffer(sbi->s_sbh);

	ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);
@@ -885,7 +884,7 @@ static int ext4_file_open(struct inode *inode, struct file *filp) 
			return ret;

	}



	filp->f_mode |= FMODE_NOWAIT;

	filp->f_mode |= FMODE_NOWAIT | FMODE_CAN_ODIRECT;

	return dquot_file_open(inode, filp);

}

fs/ext4/inode.c

+2 −9
Original line number Diff line number Diff line
@@ -1865,7 +1865,7 @@ static int mpage_submit_folio(struct mpage_da_data *mpd, struct folio *folio) 
	len = folio_size(folio);

	if (folio_pos(folio) + len > size &&

	    !ext4_verity_in_progress(mpd->inode))

		len = size & ~PAGE_MASK;

		len = size & (len - 1);

	err = ext4_bio_write_folio(&mpd->io_submit, folio, len);

	if (!err)

		mpd->wbc->nr_to_write--;
@@ -2334,7 +2334,7 @@ static int mpage_journal_page_buffers(handle_t *handle, 


	if (folio_pos(folio) + len > size &&

	    !ext4_verity_in_progress(inode))

		len = size - folio_pos(folio);

		len = size & (len - 1);



	return ext4_journal_folio_buffers(handle, folio, len);

}
@@ -2887,9 +2887,6 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping, 
	if (IS_ERR(folio))

		return PTR_ERR(folio);



	/* In case writeback began while the folio was unlocked */

	folio_wait_stable(folio);



#ifdef CONFIG_FS_ENCRYPTION

	ret = ext4_block_write_begin(folio, pos, len, ext4_da_get_block_prep);

#else
@@ -3530,7 +3527,6 @@ static const struct address_space_operations ext4_aops = { 
	.bmap			= ext4_bmap,

	.invalidate_folio	= ext4_invalidate_folio,

	.release_folio		= ext4_release_folio,

	.direct_IO		= noop_direct_IO,

	.migrate_folio		= buffer_migrate_folio,

	.is_partially_uptodate  = block_is_partially_uptodate,

	.error_remove_folio	= generic_error_remove_folio,
@@ -3547,7 +3543,6 @@ static const struct address_space_operations ext4_journalled_aops = { 
	.bmap			= ext4_bmap,

	.invalidate_folio	= ext4_journalled_invalidate_folio,

	.release_folio		= ext4_release_folio,

	.direct_IO		= noop_direct_IO,

	.migrate_folio		= buffer_migrate_folio_norefs,

	.is_partially_uptodate  = block_is_partially_uptodate,

	.error_remove_folio	= generic_error_remove_folio,
@@ -3564,7 +3559,6 @@ static const struct address_space_operations ext4_da_aops = { 
	.bmap			= ext4_bmap,

	.invalidate_folio	= ext4_invalidate_folio,

	.release_folio		= ext4_release_folio,

	.direct_IO		= noop_direct_IO,

	.migrate_folio		= buffer_migrate_folio,

	.is_partially_uptodate  = block_is_partially_uptodate,

	.error_remove_folio	= generic_error_remove_folio,
@@ -3573,7 +3567,6 @@ static const struct address_space_operations ext4_da_aops = { 


static const struct address_space_operations ext4_dax_aops = {

	.writepages		= ext4_dax_writepages,

	.direct_IO		= noop_direct_IO,

	.dirty_folio		= noop_dirty_folio,

	.bmap			= ext4_bmap,

	.swap_activate		= ext4_iomap_swap_activate,