Received-SPF: pass (google.com: domain of linux-kernel+bounces-175232-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 10 May 2024 13:10:03 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Al Viro <viro@zeniv.linux.org.uk>
Cc: Damien Le Moal <dlemoal@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20240510131003.70f46881@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

block/blk-zoned.c: In function 'blk_zone_write_plug_bio_endio':
block/blk-zoned.c:1260:25: error: 'struct block_device' has no member named=
 'bd_has_submit_bio'
 1260 |         if (bio->bi_bdev->bd_has_submit_bio)
      |                         ^~
block/blk-zoned.c: In function 'blk_zone_wplug_bio_work':
block/blk-zoned.c:1329:17: error: 'struct block_device' has no member named=
 'bd_has_submit_bio'
 1329 |         if (bdev->bd_has_submit_bio)
      |                 ^~

Caused by commit

  dd291d77cc90 ("block: Introduce zone write plugging")

interacting with commit

  ac2b6f9dee8f ("bdev: move ->bd_has_subit_bio to ->__bd_flags")

from the vfs tree.

I have applied the following merge resolution patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 10 May 2024 12:59:09 +1000
Subject: [PATCH] fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"

interacting with "block: Introduce zone write plugging".

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 block/blk-zoned.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 57d367ada1f2..03aa4eead39e 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1257,7 +1257,7 @@ void blk_zone_write_plug_bio_endio(struct bio *bio)
 	 * is not called. So we need to schedule execution of the next
 	 * plugged BIO here.
 	 */
-	if (bio->bi_bdev->bd_has_submit_bio)
+	if (bdev_test_flag(bio->bi_bdev, BD_HAS_SUBMIT_BIO))
 		disk_zone_wplug_unplug_bio(disk, zwplug);
=20
 	/* Drop the reference we took when entering this function. */
@@ -1326,7 +1326,7 @@ static void blk_zone_wplug_bio_work(struct work_struc=
t *work)
 	 * path for BIO-based devices will not do that. So drop this extra
 	 * reference here.
 	 */
-	if (bdev->bd_has_submit_bio)
+	if (bdev_test_flag(bdev, BD_HAS_SUBMIT_BIO))
 		blk_queue_exit(bdev->bd_disk->queue);
=20
 put_zwplug:
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY9kAsACgkQAVBC80lX
0GwbEAf/adypU03m99zkCNZ0GBjnS+iK2E9ZNM04woxhPKQMknfgOkLaQLyfaFHD
oL9n2SIzPZ+sh44ulM9QSh+XO2zjSMtbpB4pQMBxc+OOMHVJZxwJlo82iupPldZF
wt8xut7Cstu+gu44o2YBKV4C0zVgf0jnMCgJKCO7eIAcvbZONAE8kELVmszYkRUZ
JfuDqfmUVFDYsxLp7mWtPpusLCo8Whbw4YXMcSmCVjgQaO6GMDFw/+0jwedoRiBj
jHNMcQ8bFt2dIrUciIXJBklnqVIBQ6aqEOvhIsgQpOtvLZaJdZnSz7ju9Z86yCf/
km+Nzq5AR+Uo23Z6IJGqtPkLMqxvHQ==
=oZHg
-----END PGP SIGNATURE-----

--Sig_/CA8QBtHjdZ7LNPB0JHKF2Uf--