Commit 241d4ca1 authored Mar 29, 2026 by Linus Torvalds

ext4

Pull ext4 fixes from Ted Ts'o:

 - Update the MAINTAINERS file to add reviewers for the ext4 file system

 - Add a test issue an ext4 warning (not a WARN_ON) if there are still
   dirty pages attached to an evicted inode.

 - Fix a number of Syzkaller issues

 - Fix memory leaks on error paths

 - Replace some BUG and WARN with EFSCORRUPTED reporting

 - Fix a potential crash when disabling discard via remount followed by
   an immediate unmount. (Found by Sashiko)

 - Fix a corner case which could lead to allocating blocks for an
   indirect-mapped inode block numbers > 2**32

 - Fix a race when reallocating a freed inode that could result in a
   deadlock

 - Fix a user-after-free in update_super_work when racing with umount

 - Fix build issues when trying to build ext4's kunit tests as a module

 - Fix a bug where ext4_split_extent_zeroout() could fail to pass back
   an error from ext4_ext_dirty()

 - Avoid allocating blocks from a corrupted block group in
   ext4_mb_find_by_goal()

 - Fix a percpu_counters list corruption BUG triggered by an ext4
   extents kunit

 - Fix a potetial crash caused by the fast commit flush path potentially
   accessing the jinode structure before it is fully initialized

 - Fix fsync(2) in no-journal mode to make sure the dirtied inode is
   write to storage

 - Fix a bug when in no-journal mode, when ext4 tries to avoid using
   recently deleted inodes, if lazy itable initialization is enabled,
   can lead to an unitialized inode getting skipped and triggering an
   e2fsck complaint

 - Fix journal credit calculation when setting an xattr when both the
   encryption and ea_inode feeatures are enabled

 - Fix corner cases which could result in stale xarray tags after
   writeback

 - Fix generic/475 failures caused by ENOSPC errors while creating a
   symlink when the system crashes resulting to a file system
   inconsistency when replaying the fast commit journal

* tag 'ext4_for_linus-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (27 commits)
  ext4: always drain queued discard work in ext4_mb_release()
  ext4: handle wraparound when searching for blocks for indirect mapped blocks
  ext4: skip split extent recovery on corruption
  ext4: fix iloc.bh leak in ext4_fc_replay_inode() error paths
  ext4: fix deadlock on inode reallocation
  ext4: fix use-after-free in update_super_work when racing with umount
  ext4: fix the might_sleep() warnings in kvfree()
  ext4: reject mount if bigalloc with s_first_data_block != 0
  ext4: fix extents-test.c is not compiled when EXT4_KUNIT_TESTS=M
  ext4: fix mballoc-test.c is not compiled when EXT4_KUNIT_TESTS=M
  ext4: introduce EXPORT_SYMBOL_FOR_EXT4_TEST() helper
  jbd2: gracefully abort on checkpointing state corruptions
  ext4: avoid infinite loops caused by residual data
  ext4: validate p_idx bounds in ext4_ext_correct_indexes
  ext4: test if inode's all dirty pages are submitted to disk
  ext4: minor fix for ext4_split_extent_zeroout()
  ext4: avoid allocate block from corrupted group in ext4_mb_find_by_goal()
  ext4: kunit: extents-test: lix percpu_counters list corruption
  ext4: publish jinode after initialization
  ext4: replace BUG_ON with proper error handling in ext4_read_inline_folio
  ...

parents b51ad677 9ee29d20

MAINTAINERS

+6 −1

Original line number	Diff line number	Diff line
		@@ -9619,7 +9619,12 @@ F: include/linux/ext2*

		EXT4 FILE SYSTEM
		M: "Theodore Ts'o" <tytso@mit.edu>
		M: Andreas Dilger <adilger.kernel@dilger.ca>
		R: Andreas Dilger <adilger.kernel@dilger.ca>
		R: Baokun Li <libaokun@linux.alibaba.com>
		R: Jan Kara <jack@suse.cz>
		R: Ojaswin Mujoo <ojaswin@linux.ibm.com>
		R: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
		R: Zhang Yi <yi.zhang@huawei.com>
		L: linux-ext4@vger.kernel.org
		S: Maintained
		W: http://ext4.wiki.kernel.org

fs/ext4/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,8 @@ ext4-y := balloc.o bitmap.o block_validity.o dir.o ext4_jbd2.o extents.o \

		ext4-$(CONFIG_EXT4_FS_POSIX_ACL) += acl.o
		ext4-$(CONFIG_EXT4_FS_SECURITY) += xattr_security.o
		ext4-inode-test-objs += inode-test.o
		obj-$(CONFIG_EXT4_KUNIT_TESTS) += ext4-inode-test.o
		ext4-test-objs += inode-test.o mballoc-test.o \
		extents-test.o
		obj-$(CONFIG_EXT4_KUNIT_TESTS) += ext4-test.o
		ext4-$(CONFIG_FS_VERITY) += verity.o
		ext4-$(CONFIG_FS_ENCRYPTION) += crypto.o

fs/ext4/crypto.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -163,10 +163,17 @@ static int ext4_set_context(struct inode inode, const void ctx, size_t len,
		*/

		if (handle) {
		/*
		* Since the inode is new it is ok to pass the
		* XATTR_CREATE flag. This is necessary to match the
		* remaining journal credits check in the set_handle
		* function with the credits allocated for the new
		* inode.
		*/
		res = ext4_xattr_set_handle(handle, inode,
		EXT4_XATTR_INDEX_ENCRYPTION,
		EXT4_XATTR_NAME_ENCRYPTION_CONTEXT,
		ctx, len, 0);
		ctx, len, XATTR_CREATE);
		if (!res) {
		ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT);
		ext4_clear_inode_state(inode,

fs/ext4/ext4.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -1570,6 +1570,7 @@ struct ext4_sb_info {
		struct proc_dir_entry *s_proc;
		struct kobject s_kobj;
		struct completion s_kobj_unregister;
		struct mutex s_error_notify_mutex; /* protects sysfs_notify vs kobject_del */
		struct super_block *s_sb;
		struct buffer_head *s_mmp_bh;

		@@ -3944,6 +3945,11 @@ static inline bool ext4_inode_can_atomic_write(struct inode *inode)
		extern int ext4_block_write_begin(handle_t handle, struct folio folio,
		loff_t pos, unsigned len,
		get_block_t *get_block);

		#if IS_ENABLED(CONFIG_EXT4_KUNIT_TESTS)
		#define EXPORT_SYMBOL_FOR_EXT4_TEST(sym) \
		EXPORT_SYMBOL_FOR_MODULES(sym, "ext4-test")
		#endif
		#endif /* __KERNEL__ */

		#endif /* _EXT4_H */

fs/ext4/ext4_extents.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -264,5 +264,17 @@ static inline void ext4_idx_store_pblock(struct ext4_extent_idx *ix,
		0xffff);
		}

		extern int __ext4_ext_dirty(const char *where, unsigned int line,
		handle_t handle, struct inode inode,
		struct ext4_ext_path *path);
		extern int ext4_ext_zeroout(struct inode inode, struct ext4_extent ex);
		#if IS_ENABLED(CONFIG_EXT4_KUNIT_TESTS)
		extern int ext4_ext_space_root_idx_test(struct inode *inode, int check);
		extern struct ext4_ext_path *ext4_split_convert_extents_test(
		handle_t handle, struct inode inode,
		struct ext4_map_blocks *map,
		struct ext4_ext_path *path,
		int flags, unsigned int *allocated);
		#endif
		#endif /* _EXT4_EXTENTS */