From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the drm tree Date: Mon, 8 Jul 2019 14:48:49 +1000 Message-ID: <20190708144849.63068ed2@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2106758013==" Return-path: Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2BE888999A for ; Mon, 8 Jul 2019 04:48:53 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie , DRI , Al Viro Cc: Chenbo Feng , Linux Kernel Mailing List , Greg Hackmann , David Howells , Linux Next Mailing List List-Id: dri-devel@lists.freedesktop.org --===============2106758013== Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/6/BW6=Lwl+n4N/EV3VTcTF8"; protocol="application/pgp-signature" --Sig_/6/BW6=Lwl+n4N/EV3VTcTF8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the drm tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/dma-buf/dma-buf.c: In function 'dma_buf_fs_mount': drivers/dma-buf/dma-buf.c:65:9: error: implicit declaration of function 'mo= unt_pseudo'; did you mean 'mount_bdev'? [-Werror=3Dimplicit-function-declar= ation] return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops, ^~~~~~~~~~~~ mount_bdev drivers/dma-buf/dma-buf.c:65:9: warning: returning 'int' from a function wi= th return type 'struct dentry *' makes pointer from integer without a cast = [-Wint-conversion] return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DMA_BUF_MAGIC); ~~~~~~~~~~~~~~ Caused by commit ed63bb1d1f84 ("dma-buf: give each buffer a full-fledged inode") interacting with commit 8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()") from the vfs tree. I have added the following merge fix patch for today. From: Stephen Rothwell Date: Mon, 8 Jul 2019 14:36:53 +1000 Subject: [PATCH] dma-buf: convert to new mount api Signed-off-by: Stephen Rothwell --- drivers/dma-buf/dma-buf.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index dc4b2c521d79..e8587c5eedb7 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -24,6 +24,7 @@ #include #include #include +#include =20 #include #include @@ -59,16 +60,19 @@ static const struct dentry_operations dma_buf_dentry_op= s =3D { =20 static struct vfsmount *dma_buf_mnt; =20 -static struct dentry *dma_buf_fs_mount(struct file_system_type *fs_type, - int flags, const char *name, void *data) +static int dma_buf_init_fs_context(struct fs_context *fc) { - return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops, - DMA_BUF_MAGIC); + struct pseudo_fs_context *ctx =3D init_pseudo(fc, DMA_BUF_MAGIC); + + if (!ctx) + return -ENOMEM; + ctx->dops =3D &dma_buf_dentry_ops; + return 0; } =20 static struct file_system_type dma_buf_fs_type =3D { .name =3D "dmabuf", - .mount =3D dma_buf_fs_mount, + .init_fs_context =3D dma_buf_init_fs_context, .kill_sb =3D kill_anon_super, }; =20 --=20 2.20.1 --=20 Cheers, Stephen Rothwell --Sig_/6/BW6=Lwl+n4N/EV3VTcTF8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0iyzEACgkQAVBC80lX 0GyldQf/XCYQ6xaBle1bYjxxbqZJcOSFyRU/dmi8d8xCmRayn69ZUhD/5ggrEN+V qtX/SJtSYw0zQMmbUefoq7zKSycKk7JMqX03IABRQP+tGCIm/DoGKoPC43dJkMSb UGP8/yGNl+KmI3Z22l952pCtBYkzDiO7VyXVM+bqwJOfFwpJ/cnChMJH2RbGGc4F K6xgTQWuPPqDuCgqc/N/orqWfGCcwTld8C89cBVdWCXZF+2RLSi6sdORFL1G/b0Y ylwy1LbaCid/Hmz/g1Ry0c0024oPN9tr+vc84cV3kuc/cR9rLXU/vBgR8Jkc7nYn qLaKv3jq4IarRck2BAKy9JXCazmhkg== =6qMm -----END PGP SIGNATURE----- --Sig_/6/BW6=Lwl+n4N/EV3VTcTF8-- --===============2106758013== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs --===============2106758013==--