Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 8 Dec 2020 20:38:59 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Martin K. Petersen" <martin.petersen@oracle.com>
Cc:     Alan Stern <stern@rowland.harvard.edu>,
        Bart Van Assche <bvanassche@acm.org>,
        Can Guo <cang@codeaurora.org>, Christoph Hellwig <hch@lst.de>,
        Hannes Reinecke <hare@suse.de>, Jens Axboe <axboe@kernel.dk>,
        Stanley Chu <stanley.chu@mediatek.com>,
        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 scsi-mkp tree
Message-ID: <20201208203859.686f83eb@canb.auug.org.au>
In-Reply-To: <20201208202853.186ae136@canb.auug.org.au>
References: <20201208202853.186ae136@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/2y8xhnXUT/QOOohesLr816Y";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Tue, 8 Dec 2020 20:28:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Hi all,
>=20
> After merging the scsi-mkp tree, today's linux-next build (sparc64
> defconfig) failed like this:
>=20
> drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: linux/mt=
d/nand_ecc.h: No such file or directory
>    17 | #include <linux/mtd/nand_ecc.h>
>       |          ^~~~~~~~~~~~~~~~~~~~~~

Clearly, it did not fail like that :-)

block/blk-core.c: In function 'blk_queue_enter':
block/blk-core.c:443:18: error: 'struct request_queue' has no member named =
'rpm_status'; did you mean 'stats'?
    if ((pm && q->rpm_status !=3D RPM_SUSPENDED) ||
                  ^~~~~~~~~~
                  stats

> Caused by commit
>=20
>   81a395cdc176 ("scsi: block: Do not accept any requests while suspended")
>=20
> # CONFIG_PM is not set
>=20
> I have applied the following patch:
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Dec 2020 20:12:33 +1100
> Subject: [PATCH] scsi: block: fix for "scsi: block: Do not accept any req=
uests while suspended"
>=20
> Fixes: 81a395cdc176 ("scsi: block: Do not accept any requests while suspe=
nded")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  block/blk-core.c | 18 ++++++++++++++----
>  1 file changed, 14 insertions(+), 4 deletions(-)
>=20
> diff --git a/block/blk-core.c b/block/blk-core.c
> index a71a5c9429d6..9c9aec1382be 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -421,6 +421,18 @@ void blk_cleanup_queue(struct request_queue *q)
>  }
>  EXPORT_SYMBOL(blk_cleanup_queue);
> =20
> +#ifdef CONFIG_PM
> +static bool rq_suspended(struct request_queue *q)
> +{
> +	return q->rpm_status =3D=3D RPM_SUSPENDED;
> +}
> +#else
> +static bool rq_suspended(struct request_queue *q)
> +{
> +	return false;
> +}
> +#endif
> +
>  /**
>   * blk_queue_enter() - try to increase q->q_usage_counter
>   * @q: request queue pointer
> @@ -440,12 +452,10 @@ int blk_queue_enter(struct request_queue *q, blk_mq=
_req_flags_t flags)
>  			 * responsible for ensuring that that counter is
>  			 * globally visible before the queue is unfrozen.
>  			 */
> -			if ((pm && q->rpm_status !=3D RPM_SUSPENDED) ||
> -			    !blk_queue_pm_only(q)) {
> +			if ((pm && !rq_suspended(q)) || !blk_queue_pm_only(q))
>  				success =3D true;
> -			} else {
> +			else
>  				percpu_ref_put(&q->q_usage_counter);
> -			}
>  		}
>  		rcu_read_unlock();
> =20
> --=20
> 2.29.2

--=20
Cheers,
Stephen Rothwell

--Sig_/2y8xhnXUT/QOOohesLr816Y
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/PSbMACgkQAVBC80lX
0GyelAgAm9HI1fl/ZxtU9NuRsgcjpTtPv9KIVpQZHHHEnKZrMKhy5IN2IWkVG0q/
ENIruQ7HgpCQmACkMFnBl8gArtni72UJVex7o2tuNI8AX8qX+TQiudq9WeDAK5+Z
6HuxbhETQCp3vOc0S+BspyQOtjgk8/g/En9uCR64NjXibPkWUv7qGqNuvOmvsddO
xcv7vZge/z9qTtO0hFBcRysiIEO8Y1X7L9jRto4PNnsn9d7/upRXx1AqflbZdQSy
vOrcyM6tQZPnAnaK8UKel1V9cfEsPpD9Nmbv4N6eP5AYDi4OJh549DBkdw4uSZAy
UbNwyv5u1szpLG/1sRj2u9UJNEFx9A==
=vuOX
-----END PGP SIGNATURE-----

--Sig_/2y8xhnXUT/QOOohesLr816Y--