Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull more vfs mount updates from Al Viro:
 "Propagation of new syscalls to other architectures + cosmetic change
  from Christian (fscontext didn't follow the convention for anon inode
  names)"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  uapi: Wire up the mount API syscalls on non-x86 arches [ver #2]
  uapi, x86: Fix the syscall numbering of the mount API syscalls [ver #2]
  uapi, fsopen: use square brackets around "fscontext" [ver #2]

20 files changed, 123 insertions, 15 deletions

diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
index 165f268beafc..9e7704e44f6d 100644
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@ -467,3 +467,9 @@
 535     common  io_uring_setup                  sys_io_uring_setup
 536     common  io_uring_enter                  sys_io_uring_enter
 537     common  io_uring_register               sys_io_uring_register
+538     common  open_tree                       sys_open_tree
+539     common  move_mount                      sys_move_mount
+540     common  fsopen                          sys_fsopen
+541     common  fsconfig                        sys_fsconfig
+542     common  fsmount                         sys_fsmount
+543     common  fspick                          sys_fspick
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index 0393917eaa57..aaf479a9e92d 100644
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -441,3 +441,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index f2a83ff6b73c..70e6882853c0 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -44,7 +44,7 @@
 #define __ARM_NR_compat_set_tls         (__ARM_NR_COMPAT_BASE + 5)
 #define __ARM_NR_COMPAT_END             (__ARM_NR_COMPAT_BASE + 0x800)
 
-#define __NR_compat_syscalls            428
+#define __NR_compat_syscalls            434
 #endif
 
 #define __ARCH_WANT_SYS_CLONE
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 23f1a44acada..c39e90600bb3 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -874,6 +874,18 @@ __SYSCALL(__NR_io_uring_setup, sys_io_uring_setup)
 __SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)
 #define __NR_io_uring_register 427
 __SYSCALL(__NR_io_uring_register, sys_io_uring_register)
+#define __NR_open_tree 428
+__SYSCALL(__NR_open_tree, sys_open_tree)
+#define __NR_move_mount 429
+__SYSCALL(__NR_move_mount, sys_move_mount)
+#define __NR_fsopen 430
+__SYSCALL(__NR_fsopen, sys_fsopen)
+#define __NR_fsconfig 431
+__SYSCALL(__NR_fsconfig, sys_fsconfig)
+#define __NR_fsmount 432
+__SYSCALL(__NR_fsmount, sys_fsmount)
+#define __NR_fspick 433
+__SYSCALL(__NR_fspick, sys_fspick)
 
 /*
  * Please add new compat syscalls above this comment and update
diff --git a/arch/ia64/kernel/syscalls/syscall.tbl b/arch/ia64/kernel/syscalls/syscall.tbl
index 56e3d0b685e1..e01df3f2f80d 100644
--- a/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@ -348,3 +348,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl
index df4ec3ec71d1..7e3d0734b2f3 100644
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@ -427,3 +427,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl
index 4964947732af..26339e417695 100644
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@ -433,3 +433,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl
index 9392dfe33f97..0e2dd68ade57 100644
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@ -366,3 +366,9 @@
 425     n32     io_uring_setup                  sys_io_uring_setup
 426     n32     io_uring_enter                  sys_io_uring_enter
 427     n32     io_uring_register               sys_io_uring_register
+428     n32     open_tree                       sys_open_tree
+429     n32     move_mount                      sys_move_mount
+430     n32     fsopen                          sys_fsopen
+431     n32     fsconfig                        sys_fsconfig
+432     n32     fsmount                         sys_fsmount
+433     n32     fspick                          sys_fspick
diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl
index cd0c8aa21fba..5eebfa0d155c 100644
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@ -342,3 +342,9 @@
 425     n64     io_uring_setup                  sys_io_uring_setup
 426     n64     io_uring_enter                  sys_io_uring_enter
 427     n64     io_uring_register               sys_io_uring_register
+428     n64     open_tree                       sys_open_tree
+429     n64     move_mount                      sys_move_mount
+430     n64     fsopen                          sys_fsopen
+431     n64     fsconfig                        sys_fsconfig
+432     n64     fsmount                         sys_fsmount
+433     n64     fspick                          sys_fspick
diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl
index e849e8ffe4a2..3cc1374e02d0 100644
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@ -415,3 +415,9 @@
 425     o32     io_uring_setup                  sys_io_uring_setup
 426     o32     io_uring_enter                  sys_io_uring_enter
 427     o32     io_uring_register               sys_io_uring_register
+428     o32     open_tree                       sys_open_tree
+429     o32     move_mount                      sys_move_mount
+430     o32     fsopen                          sys_fsopen
+431     o32     fsconfig                        sys_fsconfig
+432     o32     fsmount                         sys_fsmount
+433     o32     fspick                          sys_fspick
diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl
index fe8ca623add8..c9e377d59232 100644
--- a/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@ -424,3 +424,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl
index 00f5a63c8d9a..103655d84b4b 100644
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@ -509,3 +509,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl
index 061418f787c3..e822b2964a83 100644
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@ -430,3 +430,9 @@
 425  common     io_uring_setup          sys_io_uring_setup              sys_io_uring_setup
 426  common     io_uring_enter          sys_io_uring_enter              sys_io_uring_enter
 427  common     io_uring_register       sys_io_uring_register           sys_io_uring_register
+428  common     open_tree               sys_open_tree                   sys_open_tree
+429  common     move_mount              sys_move_mount                  sys_move_mount
+430  common     fsopen                  sys_fsopen                      sys_fsopen
+431  common     fsconfig                sys_fsconfig                    sys_fsconfig
+432  common     fsmount                 sys_fsmount                     sys_fsmount
+433  common     fspick                  sys_fspick                      sys_fspick
diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl
index 480b057556ee..016a727d4357 100644
--- a/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@ -430,3 +430,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl
index a1dd24307b00..e047480b1605 100644
--- a/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@ -473,3 +473,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 4cd5f982b1e5..ad968b7bac72 100644
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -398,12 +398,6 @@
 384     i386    arch_prctl              sys_arch_prctl                  __ia32_compat_sys_arch_prctl
 385     i386    io_pgetevents           sys_io_pgetevents_time32        __ia32_compat_sys_io_pgetevents
 386     i386    rseq                    sys_rseq                        __ia32_sys_rseq
-387     i386    open_tree               sys_open_tree                   __ia32_sys_open_tree
-388     i386    move_mount              sys_move_mount                  __ia32_sys_move_mount
-389     i386    fsopen                  sys_fsopen                      __ia32_sys_fsopen
-390     i386    fsconfig                sys_fsconfig                    __ia32_sys_fsconfig
-391     i386    fsmount                 sys_fsmount                     __ia32_sys_fsmount
-392     i386    fspick                  sys_fspick                      __ia32_sys_fspick
 393     i386    semget                  sys_semget                      __ia32_sys_semget
 394     i386    semctl                  sys_semctl                      __ia32_compat_sys_semctl
 395     i386    shmget                  sys_shmget                      __ia32_sys_shmget
@@ -438,3 +432,9 @@
 425     i386    io_uring_setup          sys_io_uring_setup              __ia32_sys_io_uring_setup
 426     i386    io_uring_enter          sys_io_uring_enter              __ia32_sys_io_uring_enter
 427     i386    io_uring_register       sys_io_uring_register           __ia32_sys_io_uring_register
+428     i386    open_tree               sys_open_tree                   __ia32_sys_open_tree
+429     i386    move_mount              sys_move_mount                  __ia32_sys_move_mount
+430     i386    fsopen                  sys_fsopen                      __ia32_sys_fsopen
+431     i386    fsconfig                sys_fsconfig                    __ia32_sys_fsconfig
+432     i386    fsmount                 sys_fsmount                     __ia32_sys_fsmount
+433     i386    fspick                  sys_fspick                      __ia32_sys_fspick
diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl
index 64ca0d06259a..b4e6f9e6204a 100644
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@ -343,18 +343,18 @@
 332     common  statx                   __x64_sys_statx
 333     common  io_pgetevents           __x64_sys_io_pgetevents
 334     common  rseq                    __x64_sys_rseq
-335     common  open_tree               __x64_sys_open_tree
-336     common  move_mount              __x64_sys_move_mount
-337     common  fsopen                  __x64_sys_fsopen
-338     common  fsconfig                __x64_sys_fsconfig
-339     common  fsmount                 __x64_sys_fsmount
-340     common  fspick                  __x64_sys_fspick
 # don't use numbers 387 through 423, add new calls after the last
 # 'common' entry
 424     common  pidfd_send_signal       __x64_sys_pidfd_send_signal
 425     common  io_uring_setup          __x64_sys_io_uring_setup
 426     common  io_uring_enter          __x64_sys_io_uring_enter
 427     common  io_uring_register       __x64_sys_io_uring_register
+428     common  open_tree               __x64_sys_open_tree
+429     common  move_mount              __x64_sys_move_mount
+430     common  fsopen                  __x64_sys_fsopen
+431     common  fsconfig                __x64_sys_fsconfig
+432     common  fsmount                 __x64_sys_fsmount
+433     common  fspick                  __x64_sys_fspick
 
 #
 # x32-specific system call numbers start at 512 to avoid cache impact
diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl
index 30084eaf8422..5fa0ee1c8e00 100644
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@ -398,3 +398,9 @@
 425     common  io_uring_setup                  sys_io_uring_setup
 426     common  io_uring_enter                  sys_io_uring_enter
 427     common  io_uring_register               sys_io_uring_register
+428     common  open_tree                       sys_open_tree
+429     common  move_mount                      sys_move_mount
+430     common  fsopen                          sys_fsopen
+431     common  fsconfig                        sys_fsconfig
+432     common  fsmount                         sys_fsmount
+433     common  fspick                          sys_fspick
diff --git a/fs/fsopen.c b/fs/fsopen.c
index 3bb9c0c8cbcc..c2891e933ef1 100644
--- a/fs/fsopen.c
+++ b/fs/fsopen.c
@@ -92,7 +92,7 @@ static int fscontext_create_fd(struct fs_context *fc, unsigned int o_flags)
 {
         int fd;
 
-        fd = anon_inode_getfd("fscontext", &fscontext_fops, fc,
+        fd = anon_inode_getfd("[fscontext]", &fscontext_fops, fc,
                               O_RDWR | o_flags);
         if (fd < 0)
                 put_fs_context(fc);
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index dee7292e1df6..a87904daf103 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -832,9 +832,21 @@ __SYSCALL(__NR_io_uring_setup, sys_io_uring_setup)
 __SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)
 #define __NR_io_uring_register 427
 __SYSCALL(__NR_io_uring_register, sys_io_uring_register)
+#define __NR_open_tree 428
+__SYSCALL(__NR_open_tree, sys_open_tree)
+#define __NR_move_mount 429
+__SYSCALL(__NR_move_mount, sys_move_mount)
+#define __NR_fsopen 430
+__SYSCALL(__NR_fsopen, sys_fsopen)
+#define __NR_fsconfig 431
+__SYSCALL(__NR_fsconfig, sys_fsconfig)
+#define __NR_fsmount 432
+__SYSCALL(__NR_fsmount, sys_fsmount)
+#define __NR_fspick 433
+__SYSCALL(__NR_fspick, sys_fspick)
 
 #undef __NR_syscalls
-#define __NR_syscalls 428
+#define __NR_syscalls 434
 
 /*
  * 32 bit systems traditionally used different