From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Nov 2024 00:32:58 +0000 (-0800)
Subject: Merge tag 'ext4_for_linus-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.13-rc1~214
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e7447ab48d101353c3e5be29e6ff0d322fa5a95;p=thirdparty%2Fkernel%2Flinux.git

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

Pull ext4 updates from Ted Ts'o:
 "A lot of miscellaneous ext4 bug fixes and cleanups this cycle, most
  notably in the journaling code, bufered I/O, and compiler warning
  cleanups"

* tag 'ext4_for_linus-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (33 commits)
  jbd2: Fix comment describing journal_init_common()
  ext4: prevent an infinite loop in the lazyinit thread
  ext4: use struct_size() to improve ext4_htree_store_dirent()
  ext4: annotate struct fname with __counted_by()
  jbd2: avoid dozens of -Wflex-array-member-not-at-end warnings
  ext4: use str_yes_no() helper function
  ext4: prevent delalloc to nodelalloc on remount
  jbd2: make b_frozen_data allocation always succeed
  ext4: cleanup variable name in ext4_fc_del()
  ext4: use string choices helpers
  jbd2: remove the 'success' parameter from the jbd2_do_replay() function
  jbd2: remove useless 'block_error' variable
  jbd2: factor out jbd2_do_replay()
  jbd2: refactor JBD2_COMMIT_BLOCK process in do_one_pass()
  jbd2: unified release of buffer_head in do_one_pass()
  jbd2: remove redundant judgments for check v1 checksum
  ext4: use ERR_CAST to return an error-valued pointer
  mm: zero range of eof folio exposed by inode size extension
  ext4: partial zero eof block on unaligned inode size extension
  ext4: disambiguate the return value of ext4_dio_write_end_io()
  ...
---

3e7447ab48d101353c3e5be29e6ff0d322fa5a95
diff --cc fs/ext4/page-io.c
index b7b9261fec3b5,bb8b17c394d47..69b8a7221a2b1
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@@ -417,11 -417,13 +417,13 @@@ static void io_submit_add_bh(struct ext
  submit_and_retry:
  		ext4_io_submit(io);
  	}
- 	if (io->io_bio == NULL)
+ 	if (io->io_bio == NULL) {
  		io_submit_init_bio(io, bh);
+ 		io->io_bio->bi_write_hint = inode->i_write_hint;
+ 	}
  	if (!bio_add_folio(io->io_bio, io_folio, bh->b_size, bh_offset(bh)))
  		goto submit_and_retry;
 -	wbc_account_cgroup_owner(io->io_wbc, &folio->page, bh->b_size);
 +	wbc_account_cgroup_owner(io->io_wbc, folio, bh->b_size);
  	io->io_next_block++;
  }