From: Christian Brauner <christian.brauner@ubuntu.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christian Brauner <christian@brauner.io>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the pidfd tree
Date: Tue, 12 May 2020 12:20:24 +0200 [thread overview]
Message-ID: <20200512102024.f7sycax5qzvxay7t@wittgenstein> (raw)
In-Reply-To: <20200512201811.12480da0@canb.auug.org.au>
On Tue, May 12, 2020 at 08:18:11PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the pidfd tree, today's linux-next build (x86_64
> allnoconfig) failed like this:
>
> fs/nsfs.c:232:6: error: redefinition of 'proc_ns_file'
> 232 | bool proc_ns_file(const struct file *file)
> | ^~~~~~~~~~~~
> In file included from fs/nsfs.c:6:
> include/linux/proc_fs.h:194:20: note: previous definition of 'proc_ns_file' was here
> 194 | static inline bool proc_ns_file(const struct file *file)
> | ^~~~~~~~~~~~
>
> Caused by commit
>
> 1e76b8ad203a ("nsproxy: attach to namespaces via pidfds")
>
> I have applied the following hack for today:
Thanks for spotting this. I'll fix this now.
Christian
>
> From 07065344c6fb39c440b0de5f75842066bc97a675 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 12 May 2020 20:08:51 +1000
> Subject: [PATCH] nsproxy: protect proc_ns_file() when CONFIG_PROC_FS is not set
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/nsfs.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/nsfs.c b/fs/nsfs.c
> index 800c1d0eb0d0..9215ad7597d6 100644
> --- a/fs/nsfs.c
> +++ b/fs/nsfs.c
> @@ -229,10 +229,12 @@ int ns_get_name(char *buf, size_t size, struct task_struct *task,
> return res;
> }
>
> +#ifdef CONFIG_PROC_FS
> bool proc_ns_file(const struct file *file)
> {
> return file->f_op == &ns_file_operations;
> }
> +#endif
>
> struct file *proc_ns_fget(int fd)
> {
> --
> 2.26.2
>
> --
> Cheers,
> Stephen Rothwell
next prev parent reply other threads:[~2020-05-12 10:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 10:18 linux-next: build failure after merge of the pidfd tree Stephen Rothwell
2020-05-12 10:20 ` Christian Brauner [this message]
2020-05-12 10:28 ` Christian Brauner
-- strict thread matches above, loose matches on Subject: below --
2019-03-28 2:04 Stephen Rothwell
2019-03-28 2:28 ` Christian Brauner
2019-03-28 2:57 ` Stephen Rothwell
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=20200512102024.f7sycax5qzvxay7t@wittgenstein \
--to=christian.brauner@ubuntu.com \
--cc=christian@brauner.io \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).