Hi Linus, Please pull this branch with changes for iomap for 6.3-rc1. This is mostly rearranging things to make life easier for gfs2, nothing all that mindblowing for this release. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit 5dc4c995db9eb45f6373a956eb1f69460e69e6d4: Linux 6.2-rc4 (2023-01-15 09:22:43 -0600) are available in the Git repository at: git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/iomap-6.3-merge-1 for you to fetch changes up to 471859f57d42537626a56312cfb50cd6acee09ae: iomap: Rename page_ops to folio_ops (2023-01-18 10:44:05 -0800) ---------------------------------------------------------------- New code for 6.3: - Change when the iomap page_done function is called so that we still have a locked folio in the success case. This fixes a writeback race in gfs2. - Change when the iomap page_prepare function is called so that gfs2 can recover from OOM scenarios more gracefully. - Rename the iomap page_ops to folio_ops, since they operate on folios now. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> ---------------------------------------------------------------- Andreas Gruenbacher (8): iomap: Add __iomap_put_folio helper iomap/gfs2: Unlock and put folio in page_done handler iomap: Rename page_done handler to put_folio iomap: Add iomap_get_folio helper iomap/gfs2: Get page in page_prepare handler iomap: Add __iomap_get_folio helper iomap: Rename page_prepare handler to get_folio iomap: Rename page_ops to folio_ops fs/gfs2/bmap.c | 38 ++++++++++++++------- fs/iomap/buffered-io.c | 91 +++++++++++++++++++++++++++++++++----------------- fs/xfs/xfs_iomap.c | 4 +-- include/linux/iomap.h | 27 ++++++++------- 4 files changed, 103 insertions(+), 57 deletions(-)
