From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jul 2024 20:28:14 +0000 (-0700)
Subject: Merge tag 'vfs-6.11.iomap' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
X-Git-Tag: xfs-zoned-2024-09-16~648
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4f5e249ec0ea8872e1644df23cffffbe28007188;p=users%2Fhch%2Fxfs.git

Merge tag 'vfs-6.11.iomap' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

Pull iomap updates from Christian Brauner:
 "This contains some minor work for the iomap subsystem:

   - Add documentation on the design of iomap and how to port to it

   - Optimize iomap_read_folio()

   - Bring back the change to iomap_write_end() to no increase i_size.

     This is accompanied by a change to xfs to reserve blocks for
     truncating large realtime inodes to avoid exposing stale data when
     iomap_write_end() stops increasing i_size"

* tag 'vfs-6.11.iomap' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  iomap: don't increase i_size in iomap_write_end()
  xfs: reserve blocks for truncating large realtime inode
  Documentation: the design of iomap and how to port
  iomap: Optimize iomap_read_folio
---

4f5e249ec0ea8872e1644df23cffffbe28007188
diff --cc fs/iomap/buffered-io.c
index 95750fc8c66f,dfea29144cbc..f420c53d86ac
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@@ -457,8 -477,11 +475,8 @@@ int iomap_read_folio(struct folio *foli
  	trace_iomap_readpage(iter.inode, 1);
  
  	while ((ret = iomap_iter(&iter, ops)) > 0)
- 		iter.processed = iomap_readpage_iter(&iter, &ctx, 0);
+ 		iter.processed = iomap_read_folio_iter(&iter, &ctx);
  
 -	if (ret < 0)
 -		folio_set_error(folio);
 -
  	if (ctx.bio) {
  		submit_bio(ctx.bio);
  		WARN_ON_ONCE(!ctx.cur_folio_in_bio);