Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>,
	Al Viro <viro@zeniv.linux.org.uk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	David Howells <dhowells@redhat.com>,
	Greg Hackmann <ghackmann@google.com>,
	Sumit Semwal <sumit.semwal@linaro.org>,
	Chenbo Feng <fengc@google.com>
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> (raw)

[-- Attachment #1: Type: text/plain, Size: 2539 bytes --]

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 'mount_pseudo'; did you mean 'mount_bdev'? [-Werror=implicit-function-declaration]
  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 with 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 <sfr@canb.auug.org.au>
Date: Mon, 8 Jul 2019 14:36:53 +1000
Subject: [PATCH] dma-buf: convert to new mount api

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 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 <linux/reservation.h>
 #include <linux/mm.h>
 #include <linux/mount.h>
+#include <linux/pseudo_fs.h>
 
 #include <uapi/linux/dma-buf.h>
 #include <uapi/linux/magic.h>
@@ -59,16 +60,19 @@ static const struct dentry_operations dma_buf_dentry_ops = {
 
 static struct vfsmount *dma_buf_mnt;
 
-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 = init_pseudo(fc, DMA_BUF_MAGIC);
+
+	if (!ctx)
+		return -ENOMEM;
+	ctx->dops = &dma_buf_dentry_ops;
+	return 0;
 }
 
 static struct file_system_type dma_buf_fs_type = {
 	.name = "dmabuf",
-	.mount = dma_buf_fs_mount,
+	.init_fs_context = dma_buf_init_fs_context,
 	.kill_sb = kill_anon_super,
 };
 
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply index

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-08  4:48 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-11-05  2:54 Stephen Rothwell
2019-10-10  0:22 Stephen Rothwell
2019-04-26  2:17 Stephen Rothwell
2018-05-16  6:53 Stephen Rothwell
2018-05-16  8:09 ` Oded Gabbay
2018-05-17  5:00   ` Dave Airlie
2018-03-13  5:46 Stephen Rothwell
2018-01-02  1:48 Stephen Rothwell
2017-09-28  4:57 Stephen Rothwell
2017-03-20  0:51 Stephen Rothwell
2017-03-20  8:03 ` Daniel Vetter
2017-03-20  8:05   ` Daniel Vetter
2017-02-23 23:25 Stephen Rothwell
2017-01-24  1:25 Stephen Rothwell
2017-01-25 10:52 ` Vincent ABRIOU
2016-07-15  3:40 Stephen Rothwell
2016-07-15  4:32 ` Sedat Dilek
2016-04-28  1:57 Stephen Rothwell
2016-04-28  8:11 ` Jani Nikula
2016-03-17  4:41 Stephen Rothwell
2016-03-17  8:41 ` Christian König
2016-02-22  0:45 Stephen Rothwell
2015-12-31 10:31 Stephen Rothwell
2016-01-07  2:44 ` Stephen Rothwell
2016-01-11 22:54   ` Stephen Rothwell
2016-01-12  0:31     ` Dave Airlie
2016-01-12  4:35       ` Stephen Rothwell
2016-01-12  7:48         ` Zhu, Rex
2015-12-31  2:40 Stephen Rothwell
2015-12-31  5:14 ` Mark yao
2015-11-04  9:22 Stephen Rothwell
2015-11-09 16:45 ` Guenter Roeck
2015-11-10  4:55   ` Alexandre Courbot
2015-10-06  1:09 Stephen Rothwell
2015-06-09 13:42 Stephen Rothwell
2015-06-09 14:02 ` Deucher, Alexander
2015-06-10  0:28   ` Stephen Rothwell
2015-05-20  3:08 Stephen Rothwell
2015-05-20  4:41 ` Dave Airlie
2015-05-20  5:25   ` Stephen Rothwell
2015-05-20  5:31     ` Stephen Rothwell
2015-05-20  6:01       ` Oded Gabbay
2015-05-20  6:08         ` Dave Airlie
2015-01-29  2:38 Stephen Rothwell
2015-01-29  8:21 ` Oded Gabbay
2015-01-29  9:35   ` Stephen Rothwell
2014-09-08  4:26 Stephen Rothwell
2014-06-05  4:12 Stephen Rothwell
2014-06-05  4:28 ` Stephen Rothwell
2012-09-24  3:18 Stephen Rothwell
2012-09-24 11:31 ` Daniel Vetter
2012-09-24 11:58   ` Stephen Rothwell
2012-08-24  3:49 Stephen Rothwell
2012-05-17  3:47 Stephen Rothwell
2012-04-30  3:22 Stephen Rothwell
2012-04-23  3:42 Stephen Rothwell
2012-03-16  2:53 Stephen Rothwell
2012-03-19  2:45 ` Stephen Rothwell
2011-11-28  2:49 Stephen Rothwell
2011-11-16  0:30 Stephen Rothwell
2011-11-16 10:16 ` Alan Cox
2011-11-16 16:42   ` Jesse Barnes
2011-11-25  1:49 ` Stephen Rothwell
2011-11-25 10:30   ` Alan Cox
2011-11-25 10:34     ` Dave Airlie
2011-11-28  2:53       ` Stephen Rothwell
2011-11-28 11:30         ` Alan Cox
2011-11-28 13:13           ` Stephen Rothwell
2011-11-28 13:18             ` Alan Cox
2011-11-28 13:53               ` Stephen Rothwell
2011-11-28 14:05                 ` Dave Airlie
2011-11-28 14:08                 ` Alan Cox
2011-11-28  2:52     ` Stephen Rothwell
2011-11-28  5:07       ` Greg KH
2011-11-28 11:33       ` Alan Cox
2011-03-15  3:49 Stephen Rothwell
2010-04-08  3:12 Stephen Rothwell
2010-04-08  3:52 ` Dave Airlie
2010-04-08  4:14   ` Stephen Rothwell
2010-04-08 16:19     ` Tony Luck
2010-04-08 20:50       ` Pauli Nieminen

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190708144849.63068ed2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=dhowells@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=fengc@google.com \
    --cc=ghackmann@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sumit.semwal@linaro.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git