Hi again,
the following conflict on mm-stable still hasn't been fixed.
Thanks,
Andreas
On Fri, Feb 3, 2023 at 11:54 AM Andreas Gruenbacher <agruenba@xxxxxxxxxx> wrote:
> Hi Andrew,
>
> On Fri, Feb 3, 2023 at 7:37 AM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> > The quilt patch titled
> > Subject: gfs2: convert gfs2_write_cache_jdata() to use filemap_get_folios_tag()
> > has been removed from the -mm tree. Its filename was
> > gfs2-convert-gfs2_write_cache_jdata-to-use-filemap_get_folios_tag.patch
> >
> > This patch was dropped because it was merged into the mm-stable branch
> > of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>
> note that there now is a conflict between the following commit in v6.2-rc6:
>
> 95ecbd0f162f ("Revert "gfs2: stop using generic_writepages in gfs2_ail1_start_one"")
>
> and this commit in mm-stable:
>
> d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")
>
> Trivial resolution below.
>
> Thanks,
> Andreas
>
> ---
> fs/gfs2/log.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
> index 25fd21a9dec8..807daaeb4153 100644
> --- a/fs/gfs2/log.c
> +++ b/fs/gfs2/log.c
> @@ -80,11 +80,11 @@ void gfs2_remove_from_ail(struct gfs2_bufdata *bd)
> brelse(bd->bd_bh);
> }
>
> -static int __gfs2_writepage(struct page *page, struct writeback_control *wbc,
> - void *data)
> +static int __gfs2_writepage(struct folio *folio, struct writeback_control *wbc,
> + void *data)
> {
> struct address_space *mapping = data;
> - int ret = mapping->a_ops->writepage(page, wbc);
> + int ret = mapping->a_ops->writepage(&folio->page, wbc);
> mapping_set_error(mapping, ret);
> return ret;
> }
> --
> 2.39.0
>
