Date:   Tue, 21 Feb 2023 15:36:54 -0800
From:   Andrew Morton <akpm@linux-foundation.org>
To:     Linus Torvalds <torvalds@linux-foundation.org>
Cc:     linux-mm@kvack.org, mm-commits@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Andreas Gruenbacher <agruenba@redhat.com>
Subject: Re: [GIT PULL] MM updates for 6.3-rc1
Message-Id: <20230221153654.093d16a9ebe455644fd805ca@linux-foundation.org>
In-Reply-To: <20230220135225.91b0f28344c01d5306c31230@linux-foundation.org>
References: <20230220135225.91b0f28344c01d5306c31230@linux-foundation.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Mon, 20 Feb 2023 13:52:25 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:

> There are a lot of conflicts in your future, mainly because of the
> ongoing folio conversion work.  This will hopefully come to an end
> fairly soon.  Forthcoming conflicts which are known about, along with
> Stephen's fixes are:
> ...

And...  I failed to mention a conflict which didn't generate a reject,
thanks to a post-6.2-rc4 gfs2 patch.

Stephen's fix for this is at
https://lkml.kernel.org/r/20230127173638.1efbe423@canb.auug.org.au

Or,

From: Andrew Morton <akpm@linux-foundation.org>
Subject: fs/gfs2/log.c: fix build in  __gfs2_writepage()
Date: Tue Feb 21 03:23:08 PM PST 2023

mm-stable was based on 6.2-rc4 and hence its patch d585bdbeb79a ("fs:
convert writepage_t callback to pass a folio") didn't know about the
post-rc4 95ecbd0f162f ("Revert "gfs2: stop using generic_writepages in
gfs2_ail1_start_one"").

Net result is that d585bdbeb79a failed to convert fs/gfs2/log.c.  The fix
is from Andreas.

Fixes: d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")
Reported-by: Andreas Gruenbacher <agruenba@redhat.com>
  Link: https://lkml.kernel.org/r/20230203105401.3362277-1-agruenba@redhat.com
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


--- a/fs/gfs2/log.c~fs-gfs2-logc-fix-build-in-__gfs2_writepage
+++ a/fs/gfs2/log.c
@@ -80,11 +80,11 @@ void gfs2_remove_from_ail(struct gfs2_bu
 	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;
 }
_