Received-SPF: pass (google.com: domain of linux-kernel+bounces-178196-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Tue, 14 May 2024 09:53:36 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>, 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: Re: linux-next: build failure after merge of the block tree
Message-ID: <20240514095336.5b805453@canb.auug.org.au>
In-Reply-To: <20240510131003.70f46881@canb.auug.org.au>
References: <20240510131003.70f46881@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fo57KRCbyFjjZQkD81OmLOp";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Fri, 10 May 2024 13:10:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> 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 nam=
ed '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 nam=
ed 'bd_has_submit_bio'
>  1329 |         if (bdev->bd_has_submit_bio)
>       |                 ^~
>=20
> Caused by commit
>=20
>   dd291d77cc90 ("block: Introduce zone write plugging")
>=20
> interacting with commit
>=20
>   ac2b6f9dee8f ("bdev: move ->bd_has_subit_bio to ->__bd_flags")
>=20
> from the vfs tree.
>=20
> I have applied the following merge resolution patch.
>=20
> 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_flag=
s"
>=20
> interacting with "block: Introduce zone write plugging".
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  block/blk-zoned.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> 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_str=
uct *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

This is now a semantic conflict between the vfs tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZCqAAACgkQAVBC80lX
0Gxclwf/V6HIcsyWW98hZSKTFWyKVQIoS2XYHiiXXKaE6iKD6jiKvJnk/Km/CCIN
uTJPZOvarDDIylH5r+Eg2Y6u6wNIq85qhlOWbBWwoVmvK9SX5GN4jo77mJEoT6SB
tca64lvZA/XCKBjloC7p8GK+4e7YVGVNA7tS85oQVUELJq74/5kQGouYSopGheJY
Z/cP8hEu+9ehVBlHp6ndEpAPcU2WFVcPsWhaXm+fAzI/Qt3vJgAgGx4btWXVdKN0
/Dy5jYyeCnQE9Slt3TgIhkXkw2ZvRMtt+maHKXn0bPYf25WHam4aCY1WN0sPk0S1
tR4v4sAXHpDJng7IaZcRbqqLkXAr2A==
=p9oD
-----END PGP SIGNATURE-----

--Sig_/fo57KRCbyFjjZQkD81OmLOp--