From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@zeniv.linux.org.uk>, Arnd Bergmann <arnd@arndb.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Howells <dhowells@redhat.com>,
Nadav Amit <namit@vmware.com>
Subject: Re: linux-next: build failure after merge of the char-misc tree
Date: Fri, 12 Jul 2019 09:59:20 +0200 [thread overview]
Message-ID: <20190712075920.GA18592@kroah.com> (raw)
In-Reply-To: <20190712104430.739f1b61@canb.auug.org.au>
On Fri, Jul 12, 2019 at 10:44:30AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 8 Jul 2019 19:23:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/misc/vmw_balloon.c: In function 'vmballoon_mount':
> > drivers/misc/vmw_balloon.c:1736:14: error: 'simple_dname' undeclared (first use in this function); did you mean 'simple_rename'?
> > .d_dname = simple_dname,
> > ^~~~~~~~~~~~
> > simple_rename
> > drivers/misc/vmw_balloon.c:1736:14: note: each undeclared identifier is reported only once for each function it appears in
> > drivers/misc/vmw_balloon.c:1739:9: error: implicit declaration of function 'mount_pseudo'; did you mean 'mount_bdev'? [-Werror=implicit-function-declaration]
> > return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
> > ^~~~~~~~~~~~
> > mount_bdev
> > drivers/misc/vmw_balloon.c:1739: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, "balloon-vmware:", NULL, &ops,
> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > BALLOON_VMW_MAGIC);
> > ~~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > 83a8afa72e9c ("vmw_balloon: Compaction support")
> >
> > interacting with commits
> >
> > 7e5f7bb08b8c ("unexport simple_dname()")
> > 8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()")
> >
> > from the vfs tree.
> >
> > I applied the following merge fix patch:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 8 Jul 2019 19:17:56 +1000
> > Subject: [PATCH] convert vmwballoon to use the new mount API
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/misc/vmw_balloon.c | 14 ++++----------
> > 1 file changed, 4 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
> > index 91fa43051535..e8c0f7525f13 100644
> > --- a/drivers/misc/vmw_balloon.c
> > +++ b/drivers/misc/vmw_balloon.c
> > @@ -29,6 +29,7 @@
> > #include <linux/slab.h>
> > #include <linux/spinlock.h>
> > #include <linux/mount.h>
> > +#include <linux/pseudo_fs.h>
> > #include <linux/balloon_compaction.h>
> > #include <linux/vmw_vmci_defs.h>
> > #include <linux/vmw_vmci_api.h>
> > @@ -1728,21 +1729,14 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b)
> >
> > #ifdef CONFIG_BALLOON_COMPACTION
> >
> > -static struct dentry *vmballoon_mount(struct file_system_type *fs_type,
> > - int flags, const char *dev_name,
> > - void *data)
> > +static int vmballoon_init_fs_context(struct fs_context *fc)
> > {
> > - static const struct dentry_operations ops = {
> > - .d_dname = simple_dname,
> > - };
> > -
> > - return mount_pseudo(fs_type, "balloon-vmware:", NULL, &ops,
> > - BALLOON_VMW_MAGIC);
> > + return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM;
> > }
> >
> > static struct file_system_type vmballoon_fs = {
> > .name = "balloon-vmware",
> > - .mount = vmballoon_mount,
> > + .init_fs_context = vmballoon_init_fs_context,
> > .kill_sb = kill_anon_super,
> > };
> >
>
> This is now a conflict between the vfs tree and Linus' tree.
Looks good to me, I'll watch out for this when Al's tree is merged.
thanks,
greg k-h
next prev parent reply other threads:[~2019-07-12 8:38 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 9:23 linux-next: build failure after merge of the char-misc tree Stephen Rothwell
2019-07-12 0:44 ` Stephen Rothwell
2019-07-12 7:59 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 4:25 Stephen Rothwell
2023-06-26 9:06 ` Greg KH
2022-05-20 9:46 Stephen Rothwell
2022-05-20 19:08 ` Greg KH
2022-06-12 17:23 ` Samuel Thibault
2022-02-25 20:40 broonie
2022-02-26 15:08 ` Greg KH
2022-03-01 5:14 ` Stephen Rothwell
2022-03-01 21:27 ` Greg KH
2021-10-27 4:48 Stephen Rothwell
2021-10-27 6:51 ` Greg KH
2020-07-27 8:08 Stephen Rothwell
2020-07-27 9:24 ` Greg KH
2020-07-27 9:28 ` Oded Gabbay
2020-07-27 10:05 ` Greg KH
2020-07-27 10:59 ` Oded Gabbay
2020-07-28 7:33 ` Stephen Rothwell
2020-07-28 7:53 ` Greg KH
2020-07-28 8:23 ` Stephen Rothwell
2020-07-28 17:17 ` Greg KH
2020-07-28 17:19 ` Greg KH
2020-07-29 9:55 ` Oded Gabbay
2020-05-04 1:46 Stephen Rothwell
2020-05-04 1:47 ` Stephen Rothwell
2020-05-04 7:14 ` Greg KH
[not found] ` <BYAPR02MB394115C2C80B1169D282A646B7A60@BYAPR02MB3941.namprd02.prod.outlook.com>
2020-05-04 7:31 ` Greg KH
2017-04-12 5:18 Stephen Rothwell
2017-04-12 10:33 ` Greg KH
2017-03-20 2:44 Stephen Rothwell
2017-03-20 12:23 ` Arnd Bergmann
2017-03-21 0:18 ` Benjamin Herrenschmidt
2017-03-21 0:36 ` Cyril Bur
2017-03-21 2:58 ` Joel Stanley
2015-08-07 6:32 Stephen Rothwell
2015-05-27 5:52 Stephen Rothwell
2015-05-27 7:08 ` Winkler, Tomas
2015-05-27 12:36 ` Greg KH
2014-02-21 5:47 Stephen Rothwell
2014-02-26 6:47 ` Stephen Rothwell
2014-02-27 3:37 ` Greg KH
2014-02-27 5:48 ` Stephen Rothwell
2013-09-27 7:10 Stephen Rothwell
2013-09-28 1:04 ` Greg KH
2013-04-02 6:29 Stephen Rothwell
2013-04-02 6:49 ` Richard Weinberger
2013-03-26 4:18 Stephen Rothwell
2013-03-18 2:56 Stephen Rothwell
2013-03-18 8:58 ` Kurt Van Dijck
Reply instructions:
You may reply publicly 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=20190712075920.GA18592@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=namit@vmware.com \
--cc=sfr@canb.auug.org.au \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).