From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52E51C48BE7 for ; Mon, 8 Jul 2019 04:48:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC3C420844 for ; Mon, 8 Jul 2019 04:48:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="K9K7Kx4d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727671AbfGHEsz (ORCPT ); Mon, 8 Jul 2019 00:48:55 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:33641 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727313AbfGHEsz (ORCPT ); Mon, 8 Jul 2019 00:48:55 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 45htJL6Vn1z9s3l; Mon, 8 Jul 2019 14:48:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1562561331; bh=sKV2MToRVPaakGupotX9GjZxGEUaiI+80+PB1P1Id8o=; h=Date:From:To:Cc:Subject:From; b=K9K7Kx4d3w5xmV6ErfgHUYmakA8MLmEV/sMhChNyTlrn7TUEbaGnM7Z6CoX5OyZWU 3dJ/GFQ30Z1Scm4UJuMoE5MCIN42v0szvFoVTbyUyVZBSXWjnGdiyFgPBiciAKQ0y1 d+j7rcjyWtjVNSlw4bsbcdMCeqWVWL29FrXPaVTOu+u3osHBa8/fQGyCKK+BQtPgEf 1AfxCm9/nb2STLiqWTYIWIMLe/0duG7jesPdzoEnek58WaLVIsQaff+6c2tliybei8 MwRbKzwaCMHwNftqJRnFkADY1V0YFMLAexgKl6YYg1igcO5iblJ/+syXwcgyhd7rq6 pIFHQxCKwF3wA== Date: Mon, 8 Jul 2019 14:48:49 +1000 From: Stephen Rothwell To: Dave Airlie , DRI , Al Viro Cc: Linux Next Mailing List , Linux Kernel Mailing List , David Howells , Greg Hackmann , Sumit Semwal , Chenbo Feng Subject: linux-next: build failure after merge of the drm tree Message-ID: <20190708144849.63068ed2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/6/BW6=Lwl+n4N/EV3VTcTF8"; protocol="application/pgp-signature" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Archived-At: List-Archive: List-Post: --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--