Commit 056f8c43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ext4 updates from Ted Ts'o:
 "Lots of cleanups and bug fixes this cycle, primarily in the block
  allocation, extent management, fast commit, and journalling"

* tag 'ext4_for_linus-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (93 commits)
  ext4: convert EXT4_B2C(sbi->s_stripe) users to EXT4_NUM_B2C
  ext4: check stripe size compatibility on remount as well
  ext4: fix i_data_sem unlock order in ext4_ind_migrate()
  ext4: remove the special buffer dirty handling in do_journal_get_write_access
  ext4: fix a potential assertion failure due to improperly dirtied buffer
  ext4: hoist ext4_block_write_begin and replace the __block_write_begin
  ext4: persist the new uptodate buffers in ext4_journalled_zero_new_buffers
  ext4: dax: keep orphan list before truncate overflow allocated blocks
  ext4: fix error message when rejecting the default hash
  ext4: save unnecessary indentation in ext4_ext_create_new_leaf()
  ext4: make some fast commit functions reuse extents path
  ext4: refactor ext4_swap_extents() to reuse extents path
  ext4: get rid of ppath in convert_initialized_extent()
  ext4: get rid of ppath in ext4_ext_handle_unwritten_extents()
  ext4: get rid of ppath in ext4_ext_convert_to_initialized()
  ext4: get rid of ppath in ext4_convert_unwritten_extents_endio()
  ext4: get rid of ppath in ext4_split_convert_extents()
  ext4: get rid of ppath in ext4_split_extent()
  ext4: get rid of ppath in ext4_force_split_extent_at()
  ext4: get rid of ppath in ext4_split_extent_at()
  ...
parents 171754c3 ff2beee2

Documentation/admin-guide/ext4.rst

+0 −10
Original line number Diff line number Diff line
@@ -212,16 +212,6 @@ When mounting an ext4 filesystem, the following option are accepted: 
        that ext4's inode table readahead algorithm will pre-read into the

        buffer cache.  The default value is 32 blocks.



  nouser_xattr

        Disables Extended User Attributes.  See the attr(5) manual page for

        more information about extended attributes.



  noacl

        This option disables POSIX Access Control List support. If ACL support

        is enabled in the kernel configuration (CONFIG_EXT4_FS_POSIX_ACL), ACL

        is enabled by default on mount. See the acl(5) manual page for more

        information about acl.



  bsddf	(*)

        Make 'df' act like BSD.

fs/ext4/bitmap.c

+6 −2
Original line number Diff line number Diff line
@@ -18,15 +18,17 @@ unsigned int ext4_count_free(char *bitmap, unsigned int numchars) 


int ext4_inode_bitmap_csum_verify(struct super_block *sb,

				  struct ext4_group_desc *gdp,

				  struct buffer_head *bh, int sz)

				  struct buffer_head *bh)

{

	__u32 hi;

	__u32 provided, calculated;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	int sz;



	if (!ext4_has_metadata_csum(sb))

		return 1;



	sz = EXT4_INODES_PER_GROUP(sb) >> 3;

	provided = le16_to_cpu(gdp->bg_inode_bitmap_csum_lo);

	calculated = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);

	if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) {
@@ -40,14 +42,16 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb, 


void ext4_inode_bitmap_csum_set(struct super_block *sb,

				struct ext4_group_desc *gdp,

				struct buffer_head *bh, int sz)

				struct buffer_head *bh)

{

	__u32 csum;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	int sz;



	if (!ext4_has_metadata_csum(sb))

		return;



	sz = EXT4_INODES_PER_GROUP(sb) >> 3;

	csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);

	gdp->bg_inode_bitmap_csum_lo = cpu_to_le16(csum & 0xFFFF);

	if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END)

fs/ext4/dir.c

+11 −3
Original line number Diff line number Diff line
@@ -280,12 +280,20 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) 
					struct fscrypt_str de_name =

							FSTR_INIT(de->name,

								de->name_len);

					u32 hash;

					u32 minor_hash;



					if (IS_CASEFOLDED(inode)) {

						hash = EXT4_DIRENT_HASH(de);

						minor_hash = EXT4_DIRENT_MINOR_HASH(de);

					} else {

						hash = 0;

						minor_hash = 0;

					}



					/* Directory is encrypted */

					err = fscrypt_fname_disk_to_usr(inode,

						EXT4_DIRENT_HASH(de),

						EXT4_DIRENT_MINOR_HASH(de),

						&de_name, &fstr);

						hash, minor_hash, &de_name, &fstr);

					de_name = fstr;

					fstr.len = save_len;

					if (err)

fs/ext4/ext4.h

+18 −13
Original line number Diff line number Diff line
@@ -1058,6 +1058,7 @@ struct ext4_inode_info { 


	/* Number of ongoing updates on this inode */

	atomic_t  i_fc_updates;

	atomic_t i_unwritten; /* Nr. of inflight conversions pending */



	/* Fast commit wait queue for this inode */

	wait_queue_head_t i_fc_wait;
@@ -1106,6 +1107,10 @@ struct ext4_inode_info { 


	/* mballoc */

	atomic_t i_prealloc_active;



	/* allocation reservation info for delalloc */

	/* In case of bigalloc, this refer to clusters rather than blocks */

	unsigned int i_reserved_data_blocks;

	struct rb_root i_prealloc_node;

	rwlock_t i_prealloc_lock;
@@ -1122,10 +1127,6 @@ struct ext4_inode_info { 
	/* ialloc */

	ext4_group_t	i_last_alloc_group;



	/* allocation reservation info for delalloc */

	/* In case of bigalloc, this refer to clusters rather than blocks */

	unsigned int i_reserved_data_blocks;



	/* pending cluster reservations for bigalloc file systems */

	struct ext4_pending_tree i_pending_tree;
@@ -1149,7 +1150,6 @@ struct ext4_inode_info { 
	 */

	struct list_head i_rsv_conversion_list;

	struct work_struct i_rsv_conversion_work;

	atomic_t i_unwritten; /* Nr. of inflight conversions pending */



	spinlock_t i_block_reservation_lock;
@@ -2338,9 +2338,9 @@ struct ext4_dir_entry_2 { 
	((struct ext4_dir_entry_hash *) \

		(((void *)(entry)) + \

		((8 + (entry)->name_len + EXT4_DIR_ROUND) & ~EXT4_DIR_ROUND)))

#define EXT4_DIRENT_HASH(entry) le32_to_cpu(EXT4_DIRENT_HASHES(de)->hash)

#define EXT4_DIRENT_HASH(entry) le32_to_cpu(EXT4_DIRENT_HASHES(entry)->hash)

#define EXT4_DIRENT_MINOR_HASH(entry) \

		le32_to_cpu(EXT4_DIRENT_HASHES(de)->minor_hash)

		le32_to_cpu(EXT4_DIRENT_HASHES(entry)->minor_hash)



static inline bool ext4_hash_in_dirent(const struct inode *inode)

{
@@ -2462,6 +2462,7 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) 
#define DX_HASH_HALF_MD4_UNSIGNED	4

#define DX_HASH_TEA_UNSIGNED		5

#define DX_HASH_SIPHASH			6

#define DX_HASH_LAST 			DX_HASH_SIPHASH



static inline u32 ext4_chksum(struct ext4_sb_info *sbi, u32 crc,

			      const void *address, unsigned int length)
@@ -2695,10 +2696,10 @@ struct mmpd_data { 
extern unsigned int ext4_count_free(char *bitmap, unsigned numchars);

void ext4_inode_bitmap_csum_set(struct super_block *sb,

				struct ext4_group_desc *gdp,

				struct buffer_head *bh, int sz);

				struct buffer_head *bh);

int ext4_inode_bitmap_csum_verify(struct super_block *sb,

				  struct ext4_group_desc *gdp,

				  struct buffer_head *bh, int sz);

				  struct buffer_head *bh);

void ext4_block_bitmap_csum_set(struct super_block *sb,

				struct ext4_group_desc *gdp,

				struct buffer_head *bh);
@@ -3712,11 +3713,12 @@ extern int ext4_map_blocks(handle_t *handle, struct inode *inode, 
extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,

						   int num,

						   struct ext4_ext_path *path);

extern int ext4_ext_insert_extent(handle_t *, struct inode *,

				  struct ext4_ext_path **,

				  struct ext4_extent *, int);

extern struct ext4_ext_path *ext4_ext_insert_extent(

				handle_t *handle, struct inode *inode,

				struct ext4_ext_path *path,

				struct ext4_extent *newext, int gb_flags);

extern struct ext4_ext_path *ext4_find_extent(struct inode *, ext4_lblk_t,

					      struct ext4_ext_path **,

					      struct ext4_ext_path *,

					      int flags);

extern void ext4_free_ext_path(struct ext4_ext_path *);

extern int ext4_ext_check_inode(struct inode *inode);
@@ -3853,6 +3855,9 @@ static inline int ext4_buffer_uptodate(struct buffer_head *bh) 
	return buffer_uptodate(bh);

}



extern int ext4_block_write_begin(handle_t *handle, struct folio *folio,

				  loff_t pos, unsigned len,

				  get_block_t *get_block);

#endif	/* __KERNEL__ */



#define EFSBADCRC	EBADMSG		/* Bad CRC detected */

fs/ext4/extents.c

+423 −400

File changed.

Preview size limit exceeded, changes collapsed.