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:28:53 +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: linux-next: build failure after merge of the scsi-mkp tree
Message-ID: <20201208202853.186ae136@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/TgGmYSiCvy6LQk_oEJFuOEW";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

After merging the scsi-mkp tree, today's linux-next build (sparc64
defconfig) failed like this:

drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: linux/mtd/=
nand_ecc.h: No such file or directory
   17 | #include <linux/mtd/nand_ecc.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  81a395cdc176 ("scsi: block: Do not accept any requests while suspended")

# CONFIG_PM is not set

I have applied the following patch:

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 reque=
sts while suspended"

Fixes: 81a395cdc176 ("scsi: block: Do not accept any requests while suspend=
ed")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 block/blk-core.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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_r=
eq_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_/TgGmYSiCvy6LQk_oEJFuOEW
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/PR1UACgkQAVBC80lX
0GxP0Af/bWpugxzTg9UEnaXMq/YocIVlc5gOTgBFR9OC3eaVR2xNT7kid6ieeQ/u
HJNsR1hnIcjb2enGJ9peC6eflgQ0Uu+xS6so9asa3Y+CbVakdsOvS55bqdcqBa1l
l0ee5FoE9Zv5ZWtg6+rA1gnM2TnmTp0KzBUUnK6o7DExYa6GsmOKvx0zJ3dtNGvK
s42imF1znP+kAToQBX3ZcIS8tAwzVVMoDhsHyIU6b/9hpsg9hnPdDPoXW7uHmNnu
5SpFG4WKMeyaF8B8t8uExSphLQ9syFXcfYWM/4amzHrJFBlUo6gWeagUfbjrtFov
EEJJTpzd+I76oq2xwhWSJIXNrHcrBg==
=x9ij
-----END PGP SIGNATURE-----

--Sig_/TgGmYSiCvy6LQk_oEJFuOEW--