Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 10 Jul 2019 10:01:38 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Sage Weil <sage@newdream.net>
Cc:     Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nikolay Borisov <nborisov@suse.com>,
        Ilya Dryomov <idryomov@gmail.com>
Subject: Re: linux-next: build failure after merge of the tip tree
Message-ID: <20190710100138.0aa36d47@canb.auug.org.au>
In-Reply-To: <20190709165459.11b353d8@canb.auug.org.au>
References: <20190709165459.11b353d8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/K8zLqV=lrMVaNpLiLljZFRd"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

On Tue, 9 Jul 2019 16:54:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>=20
> drivers/block/rbd.c: In function 'wake_lock_waiters':
> drivers/block/rbd.c:3933:2: error: implicit declaration of function 'lock=
dep_assert_held_exclusive'; did you mean 'lockdep_assert_held_write'? [-Wer=
ror=3Dimplicit-function-declaration]
>   lockdep_assert_held_exclusive(&rbd_dev->lock_rwsem);
>   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   lockdep_assert_held_write
>=20
> Caused by commit
>=20
>   9ffbe8ac05db ("locking/lockdep: Rename lockdep_assert_held_exclusive() =
-> lockdep_assert_held_write()")
>=20
> interacting with commits
>=20
>   637cd060537d ("rbd: new exclusive lock wait/wake code")
>   a2b1da09793d ("rbd: lock should be quiesced on reacquire")
>=20
> from the ceph tree.
>=20
> I have added the following merge fix patch for today.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 9 Jul 2019 16:46:12 +1000
> Subject: [PATCH] rbd: fix up for lockdep_assert_held_exclusive rename
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/block/rbd.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 723c3ef4bd59..02216fbdb854 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -3930,7 +3930,7 @@ static void wake_lock_waiters(struct rbd_device *rb=
d_dev, int result)
>  	struct rbd_img_request *img_req;
> =20
>  	dout("%s rbd_dev %p result %d\n", __func__, rbd_dev, result);
> -	lockdep_assert_held_exclusive(&rbd_dev->lock_rwsem);
> +	lockdep_assert_held_write(&rbd_dev->lock_rwsem);
> =20
>  	cancel_delayed_work(&rbd_dev->lock_dwork);
>  	if (!completion_done(&rbd_dev->acquire_wait)) {
> @@ -4209,7 +4209,7 @@ static bool rbd_quiesce_lock(struct rbd_device *rbd=
_dev)
>  	bool need_wait;
> =20
>  	dout("%s rbd_dev %p\n", __func__, rbd_dev);
> -	lockdep_assert_held_exclusive(&rbd_dev->lock_rwsem);
> +	lockdep_assert_held_write(&rbd_dev->lock_rwsem);
> =20
>  	if (rbd_dev->lock_state !=3D RBD_LOCK_STATE_LOCKED)
>  		return false;

This fix now needs to be applied to the merge of the ceph tree.
--=20
Cheers,
Stephen Rothwell

--Sig_/K8zLqV=lrMVaNpLiLljZFRd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0lKuIACgkQAVBC80lX
0Gzkhwf9HBh6ZtEpp4PTwOrsoynTc3CYF5zxyUoT7jOwCjrWBNvxSwhzrM/fdbKs
0YSAtiOQEWC7BJo1DpYgs0XQIig/LkJAoVFuOETE7AB14qTLaxjlvLnJ1dkhaM2l
9sZmbsbuJgGlJV/MbxVgVlbh0hb4S/lg+DQqXndjgxgt5C0rA+K4FjCBx0mwMv99
lmJIn+o1car8FcF+BXQKs2X+dzFByjhQCnrWzso+HvJnL09vLga6DYsrcsZUTeEm
wQ2L6JzM0GvPjnuZHaf/nlLOE1FVv4tPnsvf5CmDBlDiZT10XiUEXUP85rMKvn6E
B3VSAWgTYDkkkarDl7NhNf/NtDWy4A==
=o5q5
-----END PGP SIGNATURE-----

--Sig_/K8zLqV=lrMVaNpLiLljZFRd--