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:   Thu, 14 May 2020 18:57:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Ming Lei <ming.lei@redhat.com>,
        Bart Van Assche <bvanassche@acm.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200514185737.701b40dd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.ExBTlx8YTB9nd1mswu28VR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/.ExBTlx8YTB9nd1mswu28VR
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
allnoconfig) failed like this:

In file included from include/linux/blk-cgroup.h:23,
                 from include/linux/writeback.h:14,
                 from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:9,
                 from include/linux/suspend.h:5,
                 from arch/x86/kernel/asm-offsets.c:13:
include/linux/blkdev.h: In function 'blk_io_schedule':
include/linux/blkdev.h:1857:26: error: 'sysctl_hung_task_timeout_secs' unde=
clared (first use in this function)
 1857 |  unsigned long timeout =3D sysctl_hung_task_timeout_secs * HZ / 2;
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  e6249cdd46e4 ("block: add blk_io_schedule() for avoiding task hung in syn=
c dio")

linux/sched/sysctl.h was not included since CONFIG_BLOCK is not defined.
I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 14 May 2020 18:48:32 +1000
Subject: [PATCH] fix for "block: add blk_io_schedule() for avoiding task hu=
ng in sync dio"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/blkdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 5360696d85ff..bf99a723673b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -4,6 +4,7 @@
=20
 #include <linux/sched.h>
 #include <linux/sched/clock.h>
+#include <linux/sched/sysctl.h>
=20
 #ifdef CONFIG_BLOCK
=20
@@ -27,7 +28,6 @@
 #include <linux/percpu-refcount.h>
 #include <linux/scatterlist.h>
 #include <linux/blkzoned.h>
-#include <linux/sched/sysctl.h>
=20
 struct module;
 struct scsi_ioctl_command;
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl69CAEACgkQAVBC80lX
0Gy03ggApI7/YToKbRoFj73vKJWy+xfQg+3/ObkRZyoNfg1qOSEmhlRSpkRtDPDM
mLM11SFYFbq+L67PacpAJcuaVykmqTZ3zkuw6A9RxgLQ9tqhF2eqAIwcWgv+OLj5
AJ5SyV7F9e3MqsvJfqob6qw/g1c7k8Qm5u0mGqBbUxG7e6D0SR6H+LKwKwKtVDG1
pXtgNO53RwkPCid6F+ErviOffWi+cE2/ydegrfJYfZTMUga7CJynFcOtnDiQ/B1K
mTClnpQH12Q7ScaY12WuWpDFwbLqz+rmJZBHaYHMfx8XGxZcTiOTDnW6hs69ULBm
eYzMEw1opB1tTxwdWCcinYpmCrQd/Q==
=vw1D
-----END PGP SIGNATURE-----

--Sig_/.ExBTlx8YTB9nd1mswu28VR--