Commit e5da4c93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ext4 updates from Ted Ts'o:
 "This merge window, we've added some performance improvements in how we
  handle inode locking in the read/write paths, and improving the
  performance of Direct I/O overwrites.

  We also now record the error code which caused the first and most
  recent ext4_error() report in the superblock, to make it easier to
  root cause problems in production systems.

  There are also many of the usual cleanups and miscellaneous bug fixes"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (49 commits)
  jbd2: clean __jbd2_journal_abort_hard() and __journal_abort_soft()
  jbd2: make sure ESHUTDOWN to be recorded in the journal superblock
  ext4, jbd2: ensure panic when aborting with zero errno
  jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record
  jbd2_seq_info_next should increase position index
  jbd2: remove pointless assertion in __journal_remove_journal_head
  ext4,jbd2: fix comment and code style
  jbd2: delete the duplicated words in the comments
  ext4: fix extent_status trace points
  ext4: fix symbolic enum printing in trace output
  ext4: choose hardlimit when softlimit is larger than hardlimit in ext4_statfs_project()
  ext4: fix race conditions in ->d_compare() and ->d_hash()
  ext4: make dioread_nolock the default
  ext4: fix extent_status fragmentation for plain files
  jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal
  ext4: drop ext4_kvmalloc()
  ext4: Add EXT4_IOC_FSGETXATTR/EXT4_IOC_FSSETXATTR to compat_ioctl
  ext4: remove unused macro MPAGE_DA_EXTENT_TAIL
  ext4: add missing braces in ext4_ext_drop_refs()
  ext4: fix some nonstandard indentation in extents.c
  ...
parents 9f68e365 7f6225e4

Documentation/admin-guide/ext4.rst

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ Currently Available 
* efficient new ordered mode in JBD2 and ext4 (avoid using buffer head to force

  the ordering)

* Case-insensitive file name lookups

* file-based encryption support (fscrypt)

* file-based verity support (fsverity)



[1] Filesystems with a block size of 1k may see a limit imposed by the

directory hash tree having a maximum depth of two.

Documentation/filesystems/fscrypt.rst

+3 −3
Original line number Diff line number Diff line
@@ -1016,9 +1016,9 @@ astute users may notice some differences in behavior: 
- Direct I/O is not supported on encrypted files.  Attempts to use

  direct I/O on such files will fall back to buffered I/O.



- The fallocate operations FALLOC_FL_COLLAPSE_RANGE,

  FALLOC_FL_INSERT_RANGE, and FALLOC_FL_ZERO_RANGE are not supported

  on encrypted files and will fail with EOPNOTSUPP.

- The fallocate operations FALLOC_FL_COLLAPSE_RANGE and

  FALLOC_FL_INSERT_RANGE are not supported on encrypted files and will

  fail with EOPNOTSUPP.



- Online defragmentation of encrypted files is not supported.  The

  EXT4_IOC_MOVE_EXT and F2FS_IOC_MOVE_RANGE ioctls will fail with

fs/ext4/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -4,12 +4,7 @@ 
# kernels after the removal of ext3 driver.

config EXT3_FS

	tristate "The Extended 3 (ext3) filesystem"

	# These must match EXT4_FS selects...

	select EXT4_FS

	select JBD2

	select CRC16

	select CRYPTO

	select CRYPTO_CRC32C

	help

	  This config option is here only for backward compatibility. ext3

	  filesystem is now handled by the ext4 driver.
@@ -33,7 +28,6 @@ config EXT3_FS_SECURITY 


config EXT4_FS

	tristate "The Extended 4 (ext4) filesystem"

	# Please update EXT3_FS selects when changing these

	select JBD2

	select CRC16

	select CRYPTO

fs/ext4/balloc.c

+4 −1
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ static int ext4_validate_block_bitmap(struct super_block *sb, 
	if (buffer_verified(bh))

		goto verified;

	if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group,

			desc, bh))) {

						    desc, bh) ||

		     ext4_simulate_fail(sb, EXT4_SIM_BBITMAP_CRC))) {

		ext4_unlock_group(sb, block_group);

		ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);

		ext4_mark_group_bitmap_corrupted(sb, block_group,
@@ -505,7 +506,9 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group, 
	if (!desc)

		return -EFSCORRUPTED;

	wait_on_buffer(bh);

	ext4_simulate_fail_bh(sb, bh, EXT4_SIM_BBITMAP_EIO);

	if (!buffer_uptodate(bh)) {

		ext4_set_errno(sb, EIO);

		ext4_error(sb, "Cannot read block bitmap - "

			   "block_group = %u, block_bitmap = %llu",

			   block_group, (unsigned long long) bh->b_blocknr);

fs/ext4/dir.c

+6 −4
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ int ext4_htree_store_dirent(struct file *dir_file, __u32 hash, 
	new_fn->name_len = ent_name->len;

	new_fn->file_type = dirent->file_type;

	memcpy(new_fn->name, ent_name->name, ent_name->len);

	new_fn->name[ent_name->len] = 0;



	while (*p) {

		parent = *p;
@@ -672,9 +671,11 @@ static int ext4_d_compare(const struct dentry *dentry, unsigned int len, 
			  const char *str, const struct qstr *name)

{

	struct qstr qstr = {.name = str, .len = len };

	struct inode *inode = dentry->d_parent->d_inode;

	const struct dentry *parent = READ_ONCE(dentry->d_parent);

	const struct inode *inode = READ_ONCE(parent->d_inode);



	if (!IS_CASEFOLDED(inode) || !EXT4_SB(inode->i_sb)->s_encoding) {

	if (!inode || !IS_CASEFOLDED(inode) ||

	    !EXT4_SB(inode->i_sb)->s_encoding) {

		if (len != name->len)

			return -1;

		return memcmp(str, name->name, len);
@@ -687,10 +688,11 @@ static int ext4_d_hash(const struct dentry *dentry, struct qstr *str) 
{

	const struct ext4_sb_info *sbi = EXT4_SB(dentry->d_sb);

	const struct unicode_map *um = sbi->s_encoding;

	const struct inode *inode = READ_ONCE(dentry->d_inode);

	unsigned char *norm;

	int len, ret = 0;



	if (!IS_CASEFOLDED(dentry->d_inode) || !um)

	if (!inode || !IS_CASEFOLDED(inode) || !um)

		return 0;



	norm = kmalloc(PATH_MAX, GFP_ATOMIC);

CRA Git | Maintained and supported by SUSTech CRA and CCSE