Fix the syscall numbering of the mount API syscalls so that the numbers
match between i386 and x86_64 and that they're in the common numbering
scheme space.
Fixes: a07b20004793 ("vfs: syscall: Add open_tree(2) to reference or clone a
mount")
Fixes: 2db154b3ea8e ("vfs: syscall: Add move_mount(2) to move mounts around")
Fixes: 24dcb3d90a1f ("vfs: syscall: Add fsopen() to prepare for superblock
creation")
Fixes: ecdab150fddb ("vfs: syscall: Add fsconfig() for configuring and managing
a context")
Fixes: 93766fbd2696 ("vfs: syscall: Add fsmount() to create a mount for a
superblock")
Fixes: cf3cba4a429b ("vfs: syscall: Add fspick() to select a superblock for
reconfiguration")
Reported-by: Arnd Bergmann <[email protected]>
Signed-off-by: David Howells <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
---
arch/x86/entry/syscalls/syscall_32.tbl | 12 ++++++------
arch/x86/entry/syscalls/syscall_64.tbl | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
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
