Received-SPF: pass (google.com: domain of linux-kernel+bounces-154352-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 23 Apr 2024 10:22:53 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kemeng Shi <shikemeng@huaweicloud.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Tejun Heo <tj@kernel.org>
Subject: linux-next: build failure after merge of the mm tree
Message-ID: <20240423102253.3675d0af@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/h9oUFIeP8zYE7l0.+pbAmgA";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/h9oUFIeP8zYE7l0.+pbAmgA
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the mm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

mm/backing-dev.c: In function 'wb_stats_show':
mm/backing-dev.c:175:33: error: 'struct bdi_writeback' has no member named =
'memcg_css'
  175 |                    cgroup_ino(wb->memcg_css->cgroup),
      |                                 ^~

Caused by commit

  3acd401af0c9 ("writeback: support retrieving per group debug writeback st=
ats of bdi")

from the mm-unstable branch of the mm tree.

I have applied the following (hack) patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Apr 2024 10:06:13 +1000
Subject: [PATCH] fixup for "writeback: support retrieving per group debug
 writeback stats of bdi"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 mm/backing-dev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 481886f47164..af8c81adf7a4 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -172,7 +172,11 @@ static void wb_stats_show(struct seq_file *m, struct b=
di_writeback *wb,
 		   "b_more_io:         %10lu\n"
 		   "b_dirty_time:      %10lu\n"
 		   "state:             %10lx\n\n",
+#ifdef CONFIG_CGROUP_WRITEBACK
 		   cgroup_ino(wb->memcg_css->cgroup),
+#else
+		   (ino_t)0,
+#endif
 		   K(stats->nr_writeback),
 		   K(stats->nr_reclaimable),
 		   K(stats->wb_thresh),
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/h9oUFIeP8zYE7l0.+pbAmgA
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYm/10ACgkQAVBC80lX
0GxhrQf/YrizRSNq3WnmuQ7sJ3FSOk4BAiF8p2leUHGkRVc4e75KEjV9OekpohlP
fL6j3NRl1o0PXki6hnaRfX7fM+ei+Mb98rzL2A9UOf80yARhjPBRE+PY7YEhaSc1
rW/SxtkoASRpTws4kaabpUh1lF0ilYlF8VF+vPqJ19vIoscBjg5Yb6e2OnA7UDr9
5jOtS1WfXiuby+mQJF8jVI7HckQXesaY/jg3BhdUt23H4PHvR+FLCtS3Joz5P9Yc
gMXXyhoGp8iAcYtBTYWan8j78bE7idowmSGdUPPwQLfZSiI5xeAPasjjoH2kBy+6
U6hYFWkTSLdvvj7QjxA+V8673trcPA==
=nkFz
-----END PGP SIGNATURE-----

--Sig_/h9oUFIeP8zYE7l0.+pbAmgA--