linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the fsinfo tree
Date: Tue, 12 May 2020 20:47:05 +1000	[thread overview]
Message-ID: <20200512204705.28cee8c8@canb.auug.org.au> (raw)

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

Hi all,

After merging the fsinfo tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from fs/fsinfo.c:7:
include/linux/syscalls.h:240:18: error: conflicting types for 'sys_fsinfo'
  240 |  asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
      |                  ^~~
include/linux/syscalls.h:226:2: note: in expansion of macro '__SYSCALL_DEFINEx'
  226 |  __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
      |  ^~~~~~~~~~~~~~~~~
include/linux/syscalls.h:220:36: note: in expansion of macro 'SYSCALL_DEFINEx'
  220 | #define SYSCALL_DEFINE6(name, ...) SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
      |                                    ^~~~~~~~~~~~~~~
fs/fsinfo.c:655:1: note: in expansion of macro 'SYSCALL_DEFINE6'
  655 | SYSCALL_DEFINE6(fsinfo,
      | ^~~~~~~~~~~~~~~
In file included from fs/fsinfo.c:7:
include/linux/syscalls.h:1011:17: note: previous declaration of 'sys_fsinfo' was here
 1011 | asmlinkage long sys_fsinfo(int dfd, const char __user *pathname,
      |                 ^~~~~~~~~~

Caused by commit

  51d01aee410b ("fsinfo: Add fsinfo() syscall to query filesystem information")

I have added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 12 May 2020 20:31:22 +1000
Subject: [PATCH] fix up sys_fsinfo decalaration

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/syscalls.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 76064c0807e5..fa1ecee891c9 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1009,8 +1009,9 @@ asmlinkage long sys_watch_mount(int dfd, const char __user *path,
 asmlinkage long sys_watch_sb(int dfd, const char __user *path,
 			     unsigned int at_flags, int watch_fd, int watch_id);
 asmlinkage long sys_fsinfo(int dfd, const char __user *pathname,
-			   struct fsinfo_params __user *params, size_t params_size,
-			   void __user *result_buffer, size_t result_buf_size);
+			   const struct fsinfo_params __user *params,
+			   size_t params_size, void __user *result_buffer,
+			   size_t result_buf_size);
 
 /*
  * Architecture-specific system calls
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

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

             reply	other threads:[~2020-05-12 10:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-12 10:47 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-12  9:57 linux-next: build failure after merge of the fsinfo tree Stephen Rothwell
2020-05-12 14:00 ` Masahiro Yamada
2020-05-12 14:14   ` Stephen Rothwell
2020-05-12 23:18 ` David Howells
2020-05-12 23:26 ` David Howells

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=20200512204705.28cee8c8@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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).