Commit d723b99e 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:
 "Improvements to ext4's block allocator performance for very large file
  systems, especially when the file system or files which are highly
  fragmented. There is a new mount option, prefetch_block_bitmaps which
  will pull in the block bitmaps and set up the in-memory buddy bitmaps
  when the file system is initially mounted.

  Beyond that, a lot of bug fixes and cleanups. In particular, a number
  of changes to make ext4 more robust in the face of write errors or
  file system corruptions"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (46 commits)
  ext4: limit the length of per-inode prealloc list
  ext4: reorganize if statement of ext4_mb_release_context()
  ext4: add mb_debug logging when there are lost chunks
  ext4: Fix comment typo "the the".
  jbd2: clean up checksum verification in do_one_pass()
  ext4: change to use fallthrough macro
  ext4: remove unused parameter of ext4_generic_delete_entry function
  mballoc: replace seq_printf with seq_puts
  ext4: optimize the implementation of ext4_mb_good_group()
  ext4: delete invalid comments near ext4_mb_check_limits()
  ext4: fix typos in ext4_mb_regular_allocator() comment
  ext4: fix checking of directory entry validity for inline directories
  fs: prevent BUG_ON in submit_bh_wbc()
  ext4: correctly restore system zone info when remount fails
  ext4: handle add_system_zone() failure in ext4_setup_system_zone()
  ext4: fold ext4_data_block_valid_rcu() into the caller
  ext4: check journal inode extents more carefully
  ext4: don't allow overlapping system zones
  ext4: handle error of ext4_setup_system_zone() on remount
  ext4: delete the invalid BUGON in ext4_mb_load_buddy_gfp()
  ...
parents 5e0b17b0 27bc446e

Documentation/admin-guide/ext4.rst

+13 −10
Original line number Diff line number Diff line
@@ -489,6 +489,9 @@ Files in /sys/fs/ext4/<devname>: 
        multiple of this tuning parameter if the stripe size is not set in the

        ext4 superblock



  mb_max_inode_prealloc

        The maximum length of per-inode ext4_prealloc_space list.



  mb_max_to_scan

        The maximum number of extents the multiblock allocator will search to

        find the best extent.
@@ -529,21 +532,21 @@ Files in /sys/fs/ext4/<devname>: 
Ioctls

======



There is some Ext4 specific functionality which can be accessed by applications

through the system call interfaces. The list of all Ext4 specific ioctls are

shown in the table below.

Ext4 implements various ioctls which can be used by applications to access

ext4-specific functionality. An incomplete list of these ioctls is shown in the

table below. This list includes truly ext4-specific ioctls (``EXT4_IOC_*``) as

well as ioctls that may have been ext4-specific originally but are now supported

by some other filesystem(s) too (``FS_IOC_*``).



Table of Ext4 specific ioctls

Table of Ext4 ioctls



  EXT4_IOC_GETFLAGS

  FS_IOC_GETFLAGS

        Get additional attributes associated with inode.  The ioctl argument is

        an integer bitfield, with bit values described in ext4.h. This ioctl is

        an alias for FS_IOC_GETFLAGS.

        an integer bitfield, with bit values described in ext4.h.



  EXT4_IOC_SETFLAGS

  FS_IOC_SETFLAGS

        Set additional attributes associated with inode.  The ioctl argument is

        an integer bitfield, with bit values described in ext4.h. This ioctl is

        an alias for FS_IOC_SETFLAGS.

        an integer bitfield, with bit values described in ext4.h.



  EXT4_IOC_GETVERSION, EXT4_IOC_GETVERSION_OLD

        Get the inode i_generation number stored for each inode. The

Documentation/filesystems/ext4/about.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,6 @@ entry. 
Other References

----------------



Also see http://www.nongnu.org/ext2-doc/ for quite a collection of

Also see https://www.nongnu.org/ext2-doc/ for quite a collection of

information about ext2/3. Here's another old reference:

http://wiki.osdev.org/Ext2

fs/buffer.c

+9 −0
Original line number Diff line number Diff line
@@ -3157,6 +3157,15 @@ int __sync_dirty_buffer(struct buffer_head *bh, int op_flags) 
	WARN_ON(atomic_read(&bh->b_count) < 1);

	lock_buffer(bh);

	if (test_clear_buffer_dirty(bh)) {

		/*

		 * The bh should be mapped, but it might not be if the

		 * device was hot-removed. Not much we can do but fail the I/O.

		 */

		if (!buffer_mapped(bh)) {

			unlock_buffer(bh);

			return -EIO;

		}



		get_bh(bh);

		bh->b_end_io = end_buffer_write_sync;

		ret = submit_bh(REQ_OP_WRITE, op_flags, bh);

fs/ext4/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ config EXT4_KUNIT_TESTS 
	  This builds the ext4 KUnit tests.



	  KUnit tests run during boot and output the results to the debug log

	  in TAP format (http://testanything.org/). Only useful for kernel devs

	  in TAP format (https://testanything.org/). Only useful for kernel devs

	  running KUnit test harness and are not for inclusion into a production

	  build.

fs/ext4/balloc.c

+12 −4
Original line number Diff line number Diff line
@@ -413,7 +413,8 @@ static int ext4_validate_block_bitmap(struct super_block *sb, 
 * Return buffer_head on success or an ERR_PTR in case of failure.

 */

struct buffer_head *

ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group)

ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group,

			      bool ignore_locked)

{

	struct ext4_group_desc *desc;

	struct ext4_sb_info *sbi = EXT4_SB(sb);
@@ -441,6 +442,12 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group) 
		return ERR_PTR(-ENOMEM);

	}



	if (ignore_locked && buffer_locked(bh)) {

		/* buffer under IO already, return if called for prefetching */

		put_bh(bh);

		return NULL;

	}



	if (bitmap_uptodate(bh))

		goto verify;
@@ -487,10 +494,11 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group) 
	 * submit the buffer_head for reading

	 */

	set_buffer_new(bh);

	trace_ext4_read_block_bitmap_load(sb, block_group);

	trace_ext4_read_block_bitmap_load(sb, block_group, ignore_locked);

	bh->b_end_io = ext4_end_bitmap_read;

	get_bh(bh);

	submit_bh(REQ_OP_READ, REQ_META | REQ_PRIO, bh);

	submit_bh(REQ_OP_READ, REQ_META | REQ_PRIO |

		  (ignore_locked ? REQ_RAHEAD : 0), bh);

	return bh;

verify:

	err = ext4_validate_block_bitmap(sb, desc, block_group, bh);
@@ -534,7 +542,7 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) 
	struct buffer_head *bh;

	int err;



	bh = ext4_read_block_bitmap_nowait(sb, block_group);

	bh = ext4_read_block_bitmap_nowait(sb, block_group, false);

	if (IS_ERR(bh))

		return bh;

	err = ext4_wait_block_bitmap(sb, block_group, bh);