Commit deb9acc1 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:
 "A large number of cleanups and bug fixes, with many of the bug fixes
  found by Syzbot and fuzzing. (Many of the bug fixes involve less-used
  ext4 features such as fast_commit, inline_data and bigalloc)

  In addition, remove the writepage function for ext4, since the
  medium-term plan is to remove ->writepage() entirely. (The VM doesn't
  need or want writepage() for writeback, since it is fine with
  ->writepages() so long as ->migrate_folio() is implemented)"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (58 commits)
  ext4: fix reserved cluster accounting in __es_remove_extent()
  ext4: fix inode leak in ext4_xattr_inode_create() on an error path
  ext4: allocate extended attribute value in vmalloc area
  ext4: avoid unaccounted block allocation when expanding inode
  ext4: initialize quota before expanding inode in setproject ioctl
  ext4: stop providing .writepage hook
  mm: export buffer_migrate_folio_norefs()
  ext4: switch to using write_cache_pages() for data=journal writeout
  jbd2: switch jbd2_submit_inode_data() to use fs-provided hook for data writeout
  ext4: switch to using ext4_do_writepages() for ordered data writeout
  ext4: move percpu_rwsem protection into ext4_writepages()
  ext4: provide ext4_do_writepages()
  ext4: add support for writepages calls that cannot map blocks
  ext4: drop pointless IO submission from ext4_bio_write_page()
  ext4: remove nr_submitted from ext4_bio_write_page()
  ext4: move keep_towrite handling to ext4_bio_write_page()
  ext4: handle redirtying in ext4_bio_write_page()
  ext4: fix kernel BUG in 'ext4_write_inline_data_end()'
  ext4: make ext4_mb_initialize_context return void
  ext4: fix deadlock due to mbcache entry corruption
  ...
parents 9b93f506 1da18e38

Documentation/filesystems/mount_api.rst

+1 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ process the parameters it is given. 
       int fs_lookup_param(struct fs_context *fc,

			   struct fs_parameter *value,

			   bool want_bdev,

			   unsigned int flags,

			   struct path *_path);



     This takes a parameter that carries a string or filename type and attempts

fs/ext4/ext4.h

+7 −6
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ enum { 
 *

 * It's not paranoia if the Murphy's Law really *is* out to get you.  :-)

 */

#define TEST_FLAG_VALUE(FLAG) (EXT4_##FLAG##_FL == (1 << EXT4_INODE_##FLAG))

#define TEST_FLAG_VALUE(FLAG) (EXT4_##FLAG##_FL == (1U << EXT4_INODE_##FLAG))

#define CHECK_FLAG_VALUE(FLAG) BUILD_BUG_ON(!TEST_FLAG_VALUE(FLAG))



static inline void ext4_check_flag_values(void)
@@ -2964,7 +2964,8 @@ int do_journal_get_write_access(handle_t *handle, struct inode *inode, 
typedef enum {

	EXT4_IGET_NORMAL =	0,

	EXT4_IGET_SPECIAL =	0x0001, /* OK to iget a system inode */

	EXT4_IGET_HANDLE = 	0x0002	/* Inode # is from a handle */

	EXT4_IGET_HANDLE = 	0x0002,	/* Inode # is from a handle */

	EXT4_IGET_BAD =		0x0004  /* Allow to iget a bad inode */

} ext4_iget_flags;



extern struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
@@ -2999,6 +3000,7 @@ extern void ext4_set_inode_flags(struct inode *, bool init); 
extern int ext4_alloc_da_blocks(struct inode *inode);

extern void ext4_set_aops(struct inode *inode);

extern int ext4_writepage_trans_blocks(struct inode *);

extern int ext4_normal_submit_inode_data_buffers(struct jbd2_inode *jinode);

extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);

extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,

			     loff_t lstart, loff_t lend);
@@ -3619,8 +3621,8 @@ extern void ext4_initialize_dirent_tail(struct buffer_head *bh, 
					unsigned int blocksize);

extern int ext4_handle_dirty_dirblock(handle_t *handle, struct inode *inode,

				      struct buffer_head *bh);

extern int __ext4_unlink(handle_t *handle, struct inode *dir, const struct qstr *d_name,

			 struct inode *inode);

extern int __ext4_unlink(struct inode *dir, const struct qstr *d_name,

			 struct inode *inode, struct dentry *dentry);

extern int __ext4_link(struct inode *dir, struct inode *inode,

		       struct dentry *dentry);
@@ -3756,8 +3758,7 @@ extern void ext4_end_io_rsv_work(struct work_struct *work); 
extern void ext4_io_submit(struct ext4_io_submit *io);

extern int ext4_bio_write_page(struct ext4_io_submit *io,

			       struct page *page,

			       int len,

			       bool keep_towrite);

			       int len);

extern struct ext4_io_end_vec *ext4_alloc_io_end_vec(ext4_io_end_t *io_end);

extern struct ext4_io_end_vec *ext4_last_io_end_vec(ext4_io_end_t *io_end);

fs/ext4/ext4_jbd2.c

+10 −4
Original line number Diff line number Diff line
@@ -86,14 +86,20 @@ static int ext4_journal_check_start(struct super_block *sb) 
	return 0;

}



handle_t *__ext4_journal_start_sb(struct super_block *sb, unsigned int line,

handle_t *__ext4_journal_start_sb(struct inode *inode,

				  struct super_block *sb, unsigned int line,

				  int type, int blocks, int rsv_blocks,

				  int revoke_creds)

{

	journal_t *journal;

	int err;



	trace_ext4_journal_start(sb, blocks, rsv_blocks, revoke_creds,

	if (inode)

		trace_ext4_journal_start_inode(inode, blocks, rsv_blocks,

					revoke_creds, type,

					_RET_IP_);

	else

		trace_ext4_journal_start_sb(sb, blocks, rsv_blocks,

					revoke_creds, type,

					_RET_IP_);

	err = ext4_journal_check_start(sb);

	if (err < 0)

fs/ext4/ext4_jbd2.h

+5 −5
Original line number Diff line number Diff line
@@ -261,9 +261,9 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
	__ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \

				     (bh))



handle_t *__ext4_journal_start_sb(struct super_block *sb, unsigned int line,

				  int type, int blocks, int rsv_blocks,

				  int revoke_creds);

handle_t *__ext4_journal_start_sb(struct inode *inode, struct super_block *sb,

				  unsigned int line, int type, int blocks,

				  int rsv_blocks, int revoke_creds);

int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle);



#define EXT4_NOJOURNAL_MAX_REF_COUNT ((unsigned long) 4096)
@@ -303,7 +303,7 @@ static inline int ext4_trans_default_revoke_credits(struct super_block *sb) 
}



#define ext4_journal_start_sb(sb, type, nblocks)			\

	__ext4_journal_start_sb((sb), __LINE__, (type), (nblocks), 0,	\

	__ext4_journal_start_sb(NULL, (sb), __LINE__, (type), (nblocks), 0,\

				ext4_trans_default_revoke_credits(sb))



#define ext4_journal_start(inode, type, nblocks)			\
@@ -323,7 +323,7 @@ static inline handle_t *__ext4_journal_start(struct inode *inode, 
					     int blocks, int rsv_blocks,

					     int revoke_creds)

{

	return __ext4_journal_start_sb(inode->i_sb, line, type, blocks,

	return __ext4_journal_start_sb(inode, inode->i_sb, line, type, blocks,

				       rsv_blocks, revoke_creds);

}

fs/ext4/extents.c

+11 −5
Original line number Diff line number Diff line
@@ -2635,9 +2635,8 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode, 
			  unwritten, ex_ee_len);

		path[depth].p_ext = ex;



		a = ex_ee_block > start ? ex_ee_block : start;

		b = ex_ee_block+ex_ee_len - 1 < end ?

			ex_ee_block+ex_ee_len - 1 : end;

		a = max(ex_ee_block, start);

		b = min(ex_ee_block + ex_ee_len - 1, end);



		ext_debug(inode, "  border %u:%u\n", a, b);
@@ -5567,8 +5566,7 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len) 
	 * ee_start_lblk to shift extents

	 */

	ret = ext4_ext_shift_extents(inode, handle,

		ee_start_lblk > offset_lblk ? ee_start_lblk : offset_lblk,

		len_lblk, SHIFT_RIGHT);

		max(ee_start_lblk, offset_lblk), len_lblk, SHIFT_RIGHT);



	up_write(&EXT4_I(inode)->i_data_sem);

	if (IS_SYNC(inode))
@@ -5799,6 +5797,14 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu) 
	struct ext4_extent *extent;

	ext4_lblk_t first_lblk, first_lclu, last_lclu;



	/*

	 * if data can be stored inline, the logical cluster isn't

	 * mapped - no physical clusters have been allocated, and the

	 * file has no extents

	 */

	if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA))

		return 0;



	/* search for the extent closest to the first block in the cluster */

	path = ext4_find_extent(inode, EXT4_C2B(sbi, lclu), NULL, 0);

	if (IS_ERR(path)) {