Re: [merged mm-stable] gfs2-convert-gfs2_write_cache_jdata-to-use-filemap_get_folios_tag.patch removed from -mm tree

[Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>]

On Tue, 21 Feb 2023 23:52:02 +0100 Andreas Gruenbacher <agruenba@xxxxxxxxxx> wrote:

> Hi again,
> 
> the following conflict on mm-stable still hasn't been fixed.
>
> ...
>
> > --- 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;
> >  }

Ah.  When you said "conflict" I expected an actual patch reject.

Thanks, I'll put something together for Linus.